From fedora-cvs-commits at redhat.com Thu Mar 1 00:46:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 28 Feb 2007 19:46:25 -0500 Subject: rpms/emacspeak/devel emacspeak.spec,1.18,1.19 Message-ID: <200703010046.l210kP13026553@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/emacspeak/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26391 Modified Files: emacspeak.spec Log Message: require emacs Index: emacspeak.spec =================================================================== RCS file: /cvs/dist/rpms/emacspeak/devel/emacspeak.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- emacspeak.spec 23 Jan 2007 23:24:39 -0000 1.18 +++ emacspeak.spec 1 Mar 2007 00:46:22 -0000 1.19 @@ -1,7 +1,7 @@ Summary: emacspeak -- The Complete Audio Desktop Name: emacspeak Version: 25 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Editors Source: http://download.sourceforge.net/emacspeak/emacspeak-%{version}.tar.bz2 @@ -12,7 +12,7 @@ BuildArchitectures: noarch BuildRequires: emacs findutils perl texinfo BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: tclx +Requires: emacs tclx Patch0: emacspeak-15.0-fixpref.patch Patch1: emacspeak-tcl-pkgreq-tclx.patch @@ -73,6 +73,9 @@ %{_infodir}/* %changelog +* Thu Mar 1 2007 Jens Petersen - 25-3 +- require emacs (lxo) + * Wed Jan 24 2007 Jens Petersen - 25-2 - fix emacspeak-tcl-pkgreq-tclx.patch for ssh-outloud From fedora-cvs-commits at redhat.com Thu Mar 1 02:51:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 28 Feb 2007 21:51:20 -0500 Subject: rpms/autofs/devel autofs-5.0.1-file-map-allow-white-space-only-line.patch, NONE, 1.1 autofs.spec, 1.192, 1.193 Message-ID: <200703010251.l212pK1E019212@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18987 Modified Files: autofs.spec Added Files: autofs-5.0.1-file-map-allow-white-space-only-line.patch Log Message: * Thu Mar 1 2007 Ian Kent - 5.0.1-3 - change file map lexer to allow white-space only blank lines (bz 229434). autofs-5.0.1-file-map-allow-white-space-only-line.patch: CHANGELOG | 1 + modules/lookup_file.c | 29 ++++++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) --- NEW FILE autofs-5.0.1-file-map-allow-white-space-only-line.patch --- diff --git a/CHANGELOG b/CHANGELOG index b379431..2fc3c9e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ - give up trying to update exports list while host is mounted. - fix to "@network" matching. - check for fstab update and retry if not updated. +- change file map lexer to allow white-space only blank lines. 20/2/2007 autofs-5.0.1 ---------------------- diff --git a/modules/lookup_file.c b/modules/lookup_file.c index 0f4d8f1..4a5674e 100644 --- a/modules/lookup_file.c +++ b/modules/lookup_file.c @@ -236,11 +236,21 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig case st_badent: if (ch == '\n') { + nch = getc(f); + if (nch != EOF && isblank(nch)) { + ungetc(nch, f); + break; + } + ungetc(nch, f); state = st_begin; if (gotten == got_real || gotten == getting) goto got_it; + warn(LOGOPT_ANY, MODPREFIX + "bad map entry \"%s...\" for key " + "\"%s\"", mapent, key); goto next; - } + } else if (!isblank(ch)) + gotten = got_nothing; break; case st_entspc: @@ -274,24 +284,21 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig case st_getent: if (ch == '\n') { + if (escape == esc_all) { + state = st_begin; + warn(LOGOPT_ANY, MODPREFIX + "unmatched \" in %s for key %s", + mapent, key); + goto next; + } nch = getc(f); if (nch != EOF && isblank(nch)) { ungetc(nch, f); state = st_badent; - gotten = got_nothing; - warn(LOGOPT_ANY, MODPREFIX - "bad map entry \"%s...\" for key " - "\"%s\"", mapent, key); break; } 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) { Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- autofs.spec 23 Feb 2007 06:42:17 -0000 1.192 +++ autofs.spec 1 Mar 2007 02:51:13 -0000 1.193 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.1 -Release: 2 +Release: 3 Epoch: 1 License: GPL Group: System Environment/Daemons @@ -14,6 +14,7 @@ Patch2: autofs-5.0.1-hosts-simple-fail.patch Patch3: autofs-5.0.1-export-check-network-fix-2.patch Patch4: autofs-5.0.1-check-mtab-updated.patch +Patch5: autofs-5.0.1-file-map-allow-white-space-only-line.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 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -111,6 +113,9 @@ %{_libdir}/autofs/ %changelog +* Thu Mar 1 2007 Ian Kent - 5.0.1-3 +- change file map lexer to allow white-space only blank lines (bz 229434). + * Fri Feb 23 2007 Ian Kent - 5.0.1-2 - update "@network" matching patch. From fedora-cvs-commits at redhat.com Thu Mar 1 05:43:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 00:43:54 -0500 Subject: rpms/redhat-artwork/devel .cvsignore, 1.86, 1.87 redhat-artwork.spec, 1.172, 1.173 sources, 1.91, 1.92 Message-ID: <200703010543.l215hsAO004368@cvs.devel.redhat.com> Author: davidz Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4253 Modified Files: .cvsignore redhat-artwork.spec sources Log Message: * Thu Mar 1 2007 David Zeuthen 5.0.11-1 - New release with Fedora 7 gdm theme - Require recent gtk2-engines to fix dark scrollbars in Clearlooks Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- .cvsignore 9 Feb 2007 16:12:56 -0000 1.86 +++ .cvsignore 1 Mar 2007 05:43:52 -0000 1.87 @@ -4,3 +4,4 @@ redhat-artwork-5.0.7.tar.gz redhat-artwork-5.0.8.tar.gz redhat-artwork-5.0.10.tar.gz +redhat-artwork-5.0.11.tar.gz Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- redhat-artwork.spec 26 Feb 2007 19:03:54 -0000 1.172 +++ redhat-artwork.spec 1 Mar 2007 05:43:52 -0000 1.173 @@ -3,8 +3,8 @@ Summary: Artwork for Red Hat default look-and-feel Name: redhat-artwork -Version: 5.0.10 -Release: 4%{?dist} +Version: 5.0.11 +Release: 1%{?dist} URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz Source1: post-install-fixup.sh @@ -41,7 +41,7 @@ BuildRequires: python # for splash screens, and a logo in gdm theme -Requires: gtk2-engines +Requires: gtk2-engines >= 2.9.4-2 Requires: system-logos Conflicts: fedora-logos < 6.0.2 Conflicts: redhat-logos < 4.9.3 @@ -396,6 +396,10 @@ %config %{_sysconfdir}/gtk-2.0/gtkrc %changelog +* Thu Mar 1 2007 David Zeuthen 5.0.11-1 +- New release with Fedora 7 gdm theme +- Require recent gtk2-engines to fix dark scrollbars in Clearlooks + * Mon Feb 26 2007 Matthias Clasen 5.0.10-4 - Remove the start-here icon Index: sources =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- sources 9 Feb 2007 16:12:56 -0000 1.91 +++ sources 1 Mar 2007 05:43:52 -0000 1.92 @@ -1,3 +1,3 @@ cd630f83371dd14cf01a3767caa24da0 RHEL-gdm-theme-0.2.tar.gz 7822151af66b493e76dda4f6c4afbe33 post-install-sources.tar.gz -4eed66424a9e33ba0ba03d6f90f8bd63 redhat-artwork-5.0.10.tar.gz +f8e72cbcd975ac9d96e9436bafed8ea7 redhat-artwork-5.0.11.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 1 07:16:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 02:16:37 -0500 Subject: rpms/kernel/devel patch-2.6.21-rc2-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.576, 1.577 kernel-2.6.spec, 1.2958, 1.2959 linux-2.6-compile-fixes.patch, 1.141, 1.142 sources, 1.539, 1.540 upstream, 1.468, 1.469 Message-ID: <200703010716.l217Gb2T030878@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30589 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch sources upstream Added Files: patch-2.6.21-rc2-git1.bz2.sign Log Message: * Thu Mar 1 2007 Dave Jones - 2.6.21rc2-git1 --- NEW FILE patch-2.6.21-rc2-git1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF5kT+yGugalF9Dw4RAgNdAJ4xNb2qc90bPxCovJnfqKehZJCvbQCeNdPy LJ8tCyXHi4ve2xgG9V7xO5M= =LdUr -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.576 retrieving revision 1.577 diff -u -r1.576 -r1.577 --- .cvsignore 28 Feb 2007 19:04:52 -0000 1.576 +++ .cvsignore 1 Mar 2007 07:16:34 -0000 1.577 @@ -2,6 +2,6 @@ kernel-2.6.*.config temp-* kernel-2.6.20 -xen-11633.tar.bz2 linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 +patch-2.6.21-rc2-git1.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2958 retrieving revision 1.2959 diff -u -r1.2958 -r1.2959 --- kernel-2.6.spec 28 Feb 2007 21:09:25 -0000 1.2958 +++ kernel-2.6.spec 1 Mar 2007 07:16:34 -0000 1.2959 @@ -295,6 +295,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.21-rc2.bz2 +Patch2: patch-2.6.21-rc2-git1.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -847,6 +848,7 @@ # Update to latest upstream. %patch1 -p1 +%patch2 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -2034,6 +2036,9 @@ # - tux. %changelog +* Thu Mar 1 2007 Dave Jones +- 2.6.21rc2-git1 + * Wed Feb 28 2007 Dave Jones - reenable tickless on 32bit x86. linux-2.6-compile-fixes.patch: linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c | 4 ++++ linux-2.6.20.noarch/drivers/net/mv643xx_eth.h | 2 +- linux-2.6.20.noarch/drivers/video/nvidia/nv_backlight.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- linux-2.6-compile-fixes.patch 28 Feb 2007 20:36:07 -0000 1.141 +++ linux-2.6-compile-fixes.patch 1 Mar 2007 07:16:34 -0000 1.142 @@ -79,77 +79,3 @@ #define ETH_RX_QUEUES_ENABLED (1 << 0) /* use only Q0 for receive */ #define ETH_TX_QUEUES_ENABLED (1 << 0) /* use only Q0 for transmit */ -Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2ff7354fe888f46f6629b57e463b0a1eb956c02b -Commit: 2ff7354fe888f46f6629b57e463b0a1eb956c02b -Parent: 606135a3081e045b677cde164a296c51f66c4633 -Author: Eric W. Biederman -AuthorDate: Tue Feb 27 00:27:41 2007 -0700 -Committer: Linus Torvalds -CommitDate: Wed Feb 28 08:52:31 2007 -0800 - - [PATCH] x86_64/i386 irq: Fix !CONFIG_SMP compilation - - When removing set_native_irq I missed the fact that it was - called in a couple of places that were compiled even when - SMP support is disabled. And since the irq_desc[].affinity - field only exists in SMP things broke. - - Thanks to Simon Arlott for spotting this. - - There are a couple of ways to fix this but the simplest one - is to just remove the assignments. The affinity field is only - used to display a value to the user, and nothing on either i386 - or x86_64 reads it or depends on it being any particlua value, - so skipping the assignment is safe. The assignment that - is being removed is just for the initial affinity value before - the user explicitly sets it. The irq_desc array initializes - this field to CPU_MASK_ALL so the field is initialized to - a reasonable value in the SMP case without being set. - - Signed-off-by: Eric W. Biederman - Signed-off-by: Linus Torvalds ---- - arch/i386/kernel/io_apic.c | 2 -- - arch/x86_64/kernel/io_apic.c | 4 ---- - 2 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c -index 6fec4da..e4408ff 100644 ---- a/arch/i386/kernel/io_apic.c -+++ b/arch/i386/kernel/io_apic.c -@@ -1354,7 +1354,6 @@ static void __init setup_IO_APIC_irqs(void) - } - spin_lock_irqsave(&ioapic_lock, flags); - __ioapic_write_entry(apic, pin, entry); -- irq_desc[irq].affinity = TARGET_CPUS; - spin_unlock_irqrestore(&ioapic_lock, flags); - } - } -@@ -2875,7 +2874,6 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a - - spin_lock_irqsave(&ioapic_lock, flags); - __ioapic_write_entry(ioapic, pin, entry); -- irq_desc[irq].affinity = TARGET_CPUS; - spin_unlock_irqrestore(&ioapic_lock, flags); - - return 0; -diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c -index 48593f6..0a91368 100644 ---- a/arch/x86_64/kernel/io_apic.c -+++ b/arch/x86_64/kernel/io_apic.c -@@ -830,10 +830,6 @@ static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq, - disable_8259A_irq(irq); - - ioapic_write_entry(apic, pin, entry); -- -- spin_lock_irqsave(&ioapic_lock, flags); -- irq_desc[irq].affinity = TARGET_CPUS; -- spin_unlock_irqrestore(&ioapic_lock, flags); - } - - static void __init setup_IO_APIC_irqs(void) -- -To unsubscribe from this list: send the line "unsubscribe git-commits-head" in -the body of a message to majordomo at vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.539 retrieving revision 1.540 diff -u -r1.539 -r1.540 --- sources 28 Feb 2007 19:56:35 -0000 1.539 +++ sources 1 Mar 2007 07:16:34 -0000 1.540 @@ -1,2 +1,3 @@ 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 e31c877d30a840c590c06e53779246f4 patch-2.6.21-rc2.bz2 +b42f45a5beebc521cac22cba7f70b206 patch-2.6.21-rc2-git1.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.468 retrieving revision 1.469 diff -u -r1.468 -r1.469 --- upstream 28 Feb 2007 19:16:48 -0000 1.468 +++ upstream 1 Mar 2007 07:16:34 -0000 1.469 @@ -1,2 +1,3 @@ linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 +patch-2.6.21-rc2-git1.bz2 From fedora-cvs-commits at redhat.com Thu Mar 1 07:17:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 02:17:48 -0500 Subject: rpms/autofs/FC-6 autofs-5.0.1-rc3-check-user-info-return.patch, NONE, 1.1 autofs-5.0.1-rc3-export-check-network-fix-2.patch, NONE, 1.1 autofs-5.0.1-rc3-file-map-allow-white-space-only-line.patch, NONE, 1.1 autofs.spec, 1.174, 1.175 Message-ID: <200703010717.l217HmKh002350@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31525 Modified Files: autofs.spec Added Files: autofs-5.0.1-rc3-check-user-info-return.patch autofs-5.0.1-rc3-export-check-network-fix-2.patch autofs-5.0.1-rc3-file-map-allow-white-space-only-line.patch Log Message: * Thu Mar 1 2007 Ian Kent - 5.0.1-0.rc3.25 - change file map lexer to allow white-space only blank lines (bz 229434). - fix return check for getpwuid_r and getgrgid_r (bz 229344). - update "@network" matching patch. autofs-5.0.1-rc3-check-user-info-return.patch: direct.c | 4 ++-- indirect.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE autofs-5.0.1-rc3-check-user-info-return.patch --- diff --git a/daemon/direct.c b/daemon/direct.c index 0869858..2dc23db 100644 --- a/daemon/direct.c +++ b/daemon/direct.c @@ -1335,7 +1335,7 @@ static void *do_mount_direct(void *arg) } status = getpwuid_r(mt->uid, ppw, pw_tmp, tmplen, pppw); - if (status) { + if (status || !ppw) { error(ap->logopt, "failed to get passwd info from getpwuid_r"); free(tsv); free(pw_tmp); @@ -1382,7 +1382,7 @@ static void *do_mount_direct(void *arg) } status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr); - if (status) { + if (status || !pgr) { error(ap->logopt, "failed to get group info from getgrgid_r"); free(tsv->user); free(tsv->home); diff --git a/daemon/indirect.c b/daemon/indirect.c index 46e3f99..2068c16 100644 --- a/daemon/indirect.c +++ b/daemon/indirect.c @@ -807,7 +807,7 @@ static void *do_mount_indirect(void *arg) } status = getpwuid_r(mt->uid, ppw, pw_tmp, tmplen, pppw); - if (status) { + if (status || !ppw) { error(ap->logopt, "failed to get passwd info from getpwuid_r"); free(tsv); free(pw_tmp); @@ -854,7 +854,7 @@ static void *do_mount_indirect(void *arg) } status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr); - if (status) { + if (status || !pgr) { error(ap->logopt, "failed to get group info from getgrgid_r"); free(tsv->user); free(tsv->home); autofs-5.0.1-rc3-export-check-network-fix-2.patch: rpc_subs.c | 71 +++++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 53 insertions(+), 18 deletions(-) --- NEW FILE autofs-5.0.1-rc3-export-check-network-fix-2.patch --- diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c index f51ca82..2c5b5d5 100644 --- a/lib/rpc_subs.c +++ b/lib/rpc_subs.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include "mount.h" @@ -46,6 +47,8 @@ #define MAX_IFC_BUF 1024 #define MAX_ERR_BUF 128 +#define MAX_NETWORK_LEN 255 + /* Get numeric value of the n bits starting at position p */ #define getbits(x, p, n) ((x >> (p + 1 - n)) & ~(~0 << n)) @@ -1066,6 +1069,9 @@ static char *inet_fill_net(const char *net_num, char *net) char *np; unsigned int dots = 3; + if (strlen(net_num) > INET_ADDRSTRLEN) + return NULL; + *net = '\0'; strcpy(net, net_num); @@ -1076,6 +1082,11 @@ static char *inet_fill_net(const char *net_num, char *net) if (!*np && dots) strcat(net, "0"); } + + if (!isdigit(*np) || dots < 0) { + *net = '\0'; + return NULL; + } } while (dots--) @@ -1088,13 +1099,21 @@ static int match_network(const char *network) { struct netent *pnent, nent; const char *pcnet; - char *net, cnet[INET_ADDRSTRLEN + 1], mask[4], *pmask; + char *net, cnet[MAX_NETWORK_LEN], mask[4], *pmask; unsigned int size; + size_t l_network = strlen(network) + 1; int status; - net = alloca(strlen(network) + 1); + if (l_network > MAX_NETWORK_LEN) { + error(LOGOPT_ANY, + "match string \"%s\" too long", network); + return 0; + } + + net = alloca(l_network); if (!net) return 0; + memset(net, 0, l_network); strcpy(net, network); if ((pmask = strchr(net, '/'))) @@ -1115,32 +1134,48 @@ static int match_network(const char *network) if (pnent) { uint32_t n_net; - n_net = ntohl(nent.n_net); - pcnet = inet_ntop(nent.n_addrtype, &n_net, cnet, INET_ADDRSTRLEN); - if (!pcnet) + switch (nent.n_addrtype) { + case AF_INET: + n_net = ntohl(nent.n_net); + pcnet = inet_ntop(AF_INET, &n_net, cnet, INET_ADDRSTRLEN); + if (!pcnet) + return 0; + + if (!pmask) { + size = inet_get_net_len(nent.n_net); + if (!size) + return 0; + } + break; + + case AF_INET6: return 0; - if (!pmask) { - size = inet_get_net_len(nent.n_net); - if (!size) - return 0; + default: + return 0; } } else { - struct in_addr addr; int ret; - pcnet = inet_fill_net(net, cnet); - if (!pcnet) + if (strchr(net, ':')) { return 0; + } else { + struct in_addr addr; - ret = inet_pton(AF_INET, pcnet, &addr); - if (ret <= 0) - return 0; + pcnet = inet_fill_net(net, cnet); + if (!pcnet) + return 0; - if (!pmask) { - size = inet_get_net_len(htonl(addr.s_addr)); - if (!size) + ret = inet_pton(AF_INET, pcnet, &addr); + if (ret <= 0) return 0; + + if (!pmask) { + uint32_t nl_addr = htonl(addr.s_addr); + size = inet_get_net_len(nl_addr); + if (!size) + return 0; + } } } autofs-5.0.1-rc3-file-map-allow-white-space-only-line.patch: lookup_file.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) --- NEW FILE autofs-5.0.1-rc3-file-map-allow-white-space-only-line.patch --- diff --git a/modules/lookup_file.c b/modules/lookup_file.c index 0f4d8f1..ef35a84 100644 --- a/modules/lookup_file.c +++ b/modules/lookup_file.c @@ -236,11 +236,21 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig case st_badent: if (ch == '\n') { + nch = getc(f); + if (nch != EOF && isblank(nch)) { + ungetc(nch, f); + break; + } + ungetc(nch, f); state = st_begin; if (gotten == got_real || gotten == getting) goto got_it; + warn(LOGOPT_ANY, MODPREFIX + "bad map entry \"%s...\" for key " + "\"%s\"", mapent, key); goto next; - } + } else if (!isblank(ch)) + getting = got_nothing; break; case st_entspc: @@ -274,24 +284,25 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig case st_getent: if (ch == '\n') { + if (escape == esc_all) { + state = st_begin; + warn(LOGOPT_ANY, MODPREFIX + "unmatched \" in %s for key %s", + mapent, key); + goto next; + } nch = getc(f); if (nch != EOF && isblank(nch)) { ungetc(nch, f); state = st_badent; - gotten = got_nothing; - warn(LOGOPT_ANY, MODPREFIX + /*gotten = got_nothing;*/ + /*warn(LOGOPT_ANY, MODPREFIX "bad map entry \"%s...\" for key " - "\"%s\"", mapent, key); + "\"%s\"", mapent, key);*/ break; } 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) { Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- autofs.spec 20 Feb 2007 04:33:58 -0000 1.174 +++ autofs.spec 1 Mar 2007 07:17:46 -0000 1.175 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs %define version 5.0.1 -%define release 0.rc3.23 +%define release 0.rc3.25 Version: %{version} Release: %{release} Epoch: 1 @@ -25,6 +25,9 @@ Patch12: autofs-5.0.1-rc3-add-condrestart.patch Patch13: autofs-5.0.1-rc3-export-match-at-network-and-dot-domain.patch Patch14: autofs-5.0.1-rc3-hosts-map-name.patch +Patch15: autofs-5.0.1-rc3-check-user-info-return.patch +Patch16: autofs-5.0.1-rc3-file-map-allow-white-space-only-line.patch +Patch17: autofs-5.0.1-rc3-export-check-network-fix-2.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 @@ -81,6 +84,9 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -137,6 +143,11 @@ %{_libdir}/autofs/* %changelog +* Thu Mar 1 2007 Ian Kent - 5.0.1-0.rc3.25 +- change file map lexer to allow white-space only blank lines (bz 229434). +- fix return check for getpwuid_r and getgrgid_r (bz 229344). +- update "@network" matching patch. + * Tue Feb 20 2007 Ian Kent - 5.0.1-0.rc3.23 - add "condrestart" to init script (bz 228860). - add "@network" and .domain.name export check. From fedora-cvs-commits at redhat.com Thu Mar 1 08:28:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 03:28:25 -0500 Subject: rpms/openssh/devel openssh-4.5p1-mls.patch, 1.2, 1.3 openssh.spec, 1.105, 1.106 Message-ID: <200703010828.l218SPbU021996@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/openssh/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21980 Modified Files: openssh-4.5p1-mls.patch openssh.spec Log Message: * Thu Feb 27 2007 Tomas Mraz - 4.5p1-4 - reject connection if requested mls range is not obtained (#229278) openssh-4.5p1-mls.patch: misc.c | 10 + openbsd-compat/port-linux.c | 284 ++++++++++++++++++++++++++++++++++++++------ session.c | 4 sshd.c | 3 4 files changed, 259 insertions(+), 42 deletions(-) Index: openssh-4.5p1-mls.patch =================================================================== RCS file: /cvs/dist/rpms/openssh/devel/openssh-4.5p1-mls.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openssh-4.5p1-mls.patch 16 Jan 2007 21:20:04 -0000 1.2 +++ openssh-4.5p1-mls.patch 1 Mar 2007 08:28:22 -0000 1.3 @@ -1,6 +1,6 @@ ---- openssh-4.5p1/openbsd-compat/port-linux.c.mls 2007-01-16 22:08:06.000000000 +0100 -+++ openssh-4.5p1/openbsd-compat/port-linux.c 2007-01-16 22:11:05.000000000 +0100 -@@ -33,12 +33,22 @@ +--- openssh-4.5p1/openbsd-compat/port-linux.c.mls 2007-01-16 22:13:32.000000000 +0100 ++++ openssh-4.5p1/openbsd-compat/port-linux.c 2007-03-01 09:04:17.000000000 +0100 +@@ -33,12 +33,23 @@ #include "key.h" #include "hostfile.h" #include "auth.h" @@ -10,6 +10,7 @@ #include +#include #include ++#include +#include + +#ifdef HAVE_LINUX_AUDIT @@ -23,7 +24,7 @@ /* Wrapper around is_selinux_enabled() to log its return value once only */ static int -@@ -54,17 +64,107 @@ +@@ -54,17 +65,172 @@ return (enabled); } @@ -93,30 +94,99 @@ +get_user_context(const char *sename, const char *role, const char *lvl, + security_context_t *sc) { +#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL -+ if (role != NULL && role[0]) -+ return get_default_context_with_rolelevel(sename, role, lvl, NULL, sc); -+ else -+ return get_default_context_with_level(sename, lvl, NULL, sc); -+#else -+ if (role != NULL && role[0]) -+ return get_default_context_with_role(sename, role, NULL, sc); -+ else -+ return get_default_context(sename, NULL, sc); ++ if (get_default_context_with_level(sename, lvl, NULL, sc) != 0) { ++ /* User may have requested a level completely outside of his ++ allowed range. We get a context just for auditing as the ++ range check below will certainly fail for default context. */ +#endif ++ if (get_default_context(sename, NULL, sc) != 0) { ++ *sc = NULL; ++ return -1; ++ } ++#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL ++ } ++#endif ++ if (role != NULL && role[0]) { ++ context_t con; ++ char *type=NULL; ++ if (get_default_type(role, &type) != 0) { ++ error("get_default_type: failed to get default type for '%s'", ++ role); ++ goto out; ++ } ++ con = context_new(*sc); ++ if (!con) { ++ goto out; ++ } ++ context_role_set(con, role); ++ context_type_set(con, type); ++ freecon(*sc); ++ *sc = strdup(context_str(con)); ++ context_free(con); ++ if (!*sc) ++ return -1; ++ } ++#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL ++ if (lvl != NULL && lvl[0]) { ++ /* verify that the requested range is obtained */ ++ context_t con; ++ security_context_t obtained_raw; ++ security_context_t requested_raw; ++ con = context_new(*sc); ++ if (!con) { ++ goto out; ++ } ++ context_range_set(con, lvl); ++ if (selinux_trans_to_raw_context(*sc, &obtained_raw) < 0) { ++ context_free(con); ++ goto out; ++ } ++ if (selinux_trans_to_raw_context(context_str(con), &requested_raw) < 0) { ++ freecon(obtained_raw); ++ context_free(con); ++ goto out; ++ } ++ ++ debug("get_user_context: obtained context '%s' requested context '%s'", ++ obtained_raw, requested_raw); ++ if (strcmp(obtained_raw, requested_raw)) { ++ /* set the context to the real requested one but fail */ ++ freecon(requested_raw); ++ freecon(obtained_raw); ++ freecon(*sc); ++ *sc = strdup(context_str(con)); ++ context_free(con); ++ return -1; ++ } ++ freecon(requested_raw); ++ freecon(obtained_raw); ++ context_free(con); ++ } ++#endif ++ return 0; ++ out: ++ freecon(*sc); ++ *sc = NULL; ++ return -1; +} + /* Return the default security context for the given username */ - static security_context_t - ssh_selinux_getctxbyname(char *pwname) +-static security_context_t +-ssh_selinux_getctxbyname(char *pwname) ++static int ++ssh_selinux_getctxbyname(char *pwname, ++ security_context_t *default_sc, security_context_t *user_sc) { - security_context_t sc = NULL; -+ security_context_t defsc = NULL; +- security_context_t sc = NULL; char *sename, *lvl; + const char *reqlvl = NULL; char *role = NULL; - int r = 0; +- int r = 0; ++ int r = -1; + context_t con = NULL; + ++ *default_sc = NULL; ++ *user_sc = NULL; + if (the_authctxt) { + if (the_authctxt->role != NULL) { + char *slash; @@ -133,7 +203,7 @@ #ifdef HAVE_GETSEUSERBYNAME if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) { sename = NULL; -@@ -72,23 +172,49 @@ +@@ -72,37 +238,56 @@ } #else sename = pwname; @@ -142,60 +212,76 @@ #endif if (r == 0) { --#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL + #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL - if (role != NULL && role[0]) - r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc); - else - r = get_default_context_with_level(sename, lvl, NULL, &sc); --#else ++ r = get_default_context_with_level(sename, lvl, NULL, default_sc); + #else - if (role != NULL && role[0]) - r = get_default_context_with_role(sename, role, NULL, &sc); - else - r = get_default_context(sename, NULL, &sc); --#endif -+ r = get_user_context(sename, role, lvl, &defsc); ++ r = get_default_context(sename, NULL, default_sc); + #endif } +- if (r != 0) { +- switch (security_getenforce()) { +- case -1: +- fatal("%s: ssh_selinux_getctxbyname: " +- "security_getenforce() failed", __func__); +- case 0: +- error("%s: Failed to get default SELinux security " +- "context for %s", __func__, pwname); +- default: +- fatal("%s: Failed to get default SELinux security " +- "context for %s (in enforcing mode)", +- __func__, pwname); + if (r == 0) { + /* If launched from xinetd, we must use current level */ + if (inetd_flag && !rexeced_flag) { + security_context_t sshdsc=NULL; + -+ if (getcon(&sshdsc) < 0) ++ if (getcon_raw(&sshdsc) < 0) + fatal("failed to allocate security context"); + + if ((con=context_new(sshdsc)) == NULL) + fatal("failed to allocate selinux context"); + reqlvl = context_range_get(con); + freecon(sshdsc); ++ if (reqlvl !=NULL && lvl != NULL && strcmp(reqlvl, lvl) == 0) ++ /* we actually don't change level */ ++ reqlvl = ""; + + debug("%s: current connection level '%s'", __func__, reqlvl); + } + -+ if (reqlvl != NULL && reqlvl[0]) { -+ r = get_user_context(sename, role, reqlvl, &sc); ++ if ((reqlvl != NULL && reqlvl[0]) || (role != NULL && role[0])) { ++ r = get_user_context(sename, role, reqlvl, user_sc); + -+ if (r == 0) { -+ if (mls_range_allowed(defsc, sc)) { -+ send_audit_message(1, defsc, sc); ++ if (r == 0 && reqlvl != NULL && reqlvl[0]) { ++ /* verify that the requested range is contained in the user range */ ++ if (mls_range_allowed(*default_sc, *user_sc)) { + logit("permit MLS level %s (user range %s)", reqlvl, lvl); + } else { -+ send_audit_message(0, defsc, sc); -+ if (security_getenforce() > 0) -+ fatal("deny MLS level %s (user range %s)", reqlvl, lvl); -+ else -+ error("deny MLS level %s (user range %s). Continuing in permissive mode", reqlvl, lvl); ++ r = -1; ++ error("deny MLS level %s (user range %s)", reqlvl, lvl); + } + } -+ freecon(defsc); + } else { -+ sc = defsc; -+ } ++ *user_sc = *default_sc; + } + } ++ if (r != 0) { ++ error("%s: Failed to get default SELinux security " ++ "context for %s", __func__, pwname); + } - if (r != 0) { - switch (security_getenforce()) { - case -1: -@@ -110,6 +236,10 @@ + + #ifdef HAVE_GETSEUSERBYNAME + if (sename != NULL) +@@ -110,14 +295,20 @@ if (lvl != NULL) xfree(lvl); #endif @@ -204,9 +290,67 @@ + if (con) + context_free(con); - return (sc); +- return (sc); ++ return (r); + } + + /* Set the execution context to the default for the specified user */ + void + ssh_selinux_setup_exec_context(char *pwname) + { ++ int r = 0; ++ security_context_t default_ctx = NULL; + security_context_t user_ctx = NULL; + + if (!ssh_selinux_enabled()) +@@ -125,21 +316,39 @@ + + debug3("%s: setting execution context", __func__); + +- user_ctx = ssh_selinux_getctxbyname(pwname); +- if (setexeccon(user_ctx) != 0) { ++ r = ssh_selinux_getctxbyname(pwname, &default_ctx, &user_ctx); ++ if (r >= 0) { ++ r = setexeccon(user_ctx); ++ if (r < 0) { ++ error("%s: Failed to set SELinux execution context %s for %s", ++ __func__, user_ctx, pwname); ++ } ++ } ++ if (user_ctx == NULL) { ++ user_ctx = default_ctx; ++ } ++ if (r < 0 || user_ctx != default_ctx) { ++ /* audit just the case when user changed a role or there was ++ a failure */ ++ send_audit_message(r >= 0, default_ctx, user_ctx); ++ } ++ if (r < 0) { + switch (security_getenforce()) { + case -1: + fatal("%s: security_getenforce() failed", __func__); + case 0: +- error("%s: Failed to set SELinux execution " +- "context for %s", __func__, pwname); ++ error("%s: SELinux failure. Continuing in permissive mode.", ++ __func__); ++ break; + default: +- fatal("%s: Failed to set SELinux execution context " +- "for %s (in enforcing mode)", __func__, pwname); ++ fatal("%s: SELinux failure. Aborting connection.", ++ __func__); + } + } +- if (user_ctx != NULL) ++ if (user_ctx != NULL && user_ctx != default_ctx) + freecon(user_ctx); ++ if (default_ctx != NULL) ++ freecon(default_ctx); + + debug3("%s: done", __func__); } -@@ -157,7 +287,10 @@ +@@ -157,7 +366,10 @@ debug3("%s: setting TTY context on %s", __func__, tty); @@ -218,8 +362,8 @@ /* XXX: should these calls fatal() upon failure in enforcing mode? */ ---- openssh-4.5p1/sshd.c.mls 2007-01-16 21:43:11.000000000 +0100 -+++ openssh-4.5p1/sshd.c 2007-01-16 21:48:37.000000000 +0100 +--- openssh-4.5p1/sshd.c.mls 2007-01-16 22:13:32.000000000 +0100 ++++ openssh-4.5p1/sshd.c 2007-01-16 22:13:32.000000000 +0100 @@ -1833,6 +1833,9 @@ restore_uid(); } @@ -231,7 +375,7 @@ if (options.use_pam) { do_pam_setcred(1); --- openssh-4.5p1/misc.c.mls 2006-08-05 04:39:40.000000000 +0200 -+++ openssh-4.5p1/misc.c 2007-01-16 21:56:40.000000000 +0100 ++++ openssh-4.5p1/misc.c 2007-01-16 22:13:32.000000000 +0100 @@ -418,6 +418,7 @@ colon(char *cp) { @@ -256,8 +400,8 @@ } return (0); } ---- openssh-4.5p1/session.c.mls 2007-01-16 21:43:11.000000000 +0100 -+++ openssh-4.5p1/session.c 2007-01-16 21:46:35.000000000 +0100 +--- openssh-4.5p1/session.c.mls 2007-01-16 22:13:32.000000000 +0100 ++++ openssh-4.5p1/session.c 2007-01-16 22:13:32.000000000 +0100 @@ -1347,10 +1347,6 @@ #endif if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) Index: openssh.spec =================================================================== RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- openssh.spec 22 Feb 2007 13:00:51 -0000 1.105 +++ openssh.spec 1 Mar 2007 08:28:22 -0000 1.106 @@ -61,7 +61,7 @@ Summary: The OpenSSH implementation of SSH protocol versions 1 and 2 Name: openssh Version: 4.5p1 -Release: 3%{?dist}%{?rescue_rel} +Release: 4%{?dist}%{?rescue_rel} URL: http://www.openssh.com/portable.html #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.sig @@ -459,6 +459,9 @@ %endif %changelog +* Thu Feb 27 2007 Tomas Mraz - 4.5p1-4 +- reject connection if requested mls range is not obtained (#229278) + * Wed Feb 22 2007 Tomas Mraz - 4.5p1-3 - improve Buildroot - remove duplicate /etc/ssh from files From fedora-cvs-commits at redhat.com Thu Mar 1 08:31:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 03:31:55 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1080,1.1081 Message-ID: <200703010831.l218Vt2K003515@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3469 Modified Files: openoffice.org.spec Log Message: test build Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1080 retrieving revision 1.1081 diff -u -r1.1080 -r1.1081 --- openoffice.org.spec 28 Feb 2007 16:58:45 -0000 1.1080 +++ openoffice.org.spec 1 Mar 2007 08:31:53 -0000 1.1081 @@ -1,6 +1,6 @@ %define oootag OOF680 %define ooomilestone 9 -%define rh_rpm_release 1 +%define rh_rpm_release 1.0 # gcc#19664# %define stlvisibilityfcked 1 @@ -1070,7 +1070,7 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64" +export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limits=64" #convert _smp_mflags to dmake equivalent SMP_MFLAGS=%{?_smp_mflags} SMP_MFLAGS=${SMP_MFLAGS/-j/-P} From fedora-cvs-commits at redhat.com Thu Mar 1 08:42:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 03:42:50 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1081,1.1082 Message-ID: <200703010842.l218gomT011539@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11498 Modified Files: openoffice.org.spec Log Message: misspelling Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1081 retrieving revision 1.1082 diff -u -r1.1081 -r1.1082 --- openoffice.org.spec 1 Mar 2007 08:31:53 -0000 1.1081 +++ openoffice.org.spec 1 Mar 2007 08:42:48 -0000 1.1082 @@ -1070,7 +1070,7 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limits=64" +export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64" #convert _smp_mflags to dmake equivalent SMP_MFLAGS=%{?_smp_mflags} SMP_MFLAGS=${SMP_MFLAGS/-j/-P} From fedora-cvs-commits at redhat.com Thu Mar 1 08:52:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 03:52:28 -0500 Subject: rpms/newt-perl/devel newt-perl.spec,1.15,1.16 Message-ID: <200703010852.l218qSaG011620@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/newt-perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11571 Modified Files: newt-perl.spec Log Message: * Thu Mar 1 2007 Joe Orton 1.08-14 - various cleanups (Jason Tibbs, #226196) Index: newt-perl.spec =================================================================== RCS file: /cvs/dist/rpms/newt-perl/devel/newt-perl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- newt-perl.spec 27 Feb 2007 18:11:04 -0000 1.15 +++ newt-perl.spec 1 Mar 2007 08:52:26 -0000 1.16 @@ -1,8 +1,7 @@ - Summary: Perl bindings for the Newt library Name: newt-perl Version: 1.08 -Release: 13 +Release: 14 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot URL: http://search.cpan.org/~amedina/Newt-1.08/ @@ -12,9 +11,9 @@ Patch2: newt-perl-1.08-fix.patch Patch3: newt-perl-1.08-xs.patch Patch4: newt-perl-1.08-lang.patch -BuildRequires: newt-devel, perl, newt-devel +BuildRequires: newt-devel, perl Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") -License: Artistic +License: GPL or Artistic %description This package provides Perl bindings for the Newt widget @@ -30,22 +29,20 @@ rm -rf newtlib %build -perl Makefile.PL PREFIX=%{_prefix} INSTALLDIRS=vendor +perl Makefile.PL PREFIX=%{_prefix} INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress - find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; - -# fix Newt.so perms -find $RPM_BUILD_ROOT/usr -name Newt.so | xargs chmod 755 +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' +chmod -R u+w $RPM_BUILD_ROOT/* %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr (-,root,root) @@ -55,7 +52,10 @@ %{_mandir}/man3/Newt* %changelog -* Tue Feb 27 2007 Joe Orton 1.08-12 +* Thu Mar 1 2007 Joe Orton 1.08-14 +- various cleanups (Jason Tibbs, #226196) + +* Tue Feb 27 2007 Joe Orton 1.08-13 - clean up URL, Source, BuildRoot, BuildRequires * Thu Dec 14 2006 Joe Orton 1.08-12 From fedora-cvs-commits at redhat.com Thu Mar 1 09:12:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 04:12:31 -0500 Subject: rpms/crypto-utils/devel crypto-utils.spec,1.26,1.27 Message-ID: <200703010912.l219CVWc028444@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/crypto-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28390 Modified Files: crypto-utils.spec Log Message: * Thu Mar 1 2007 Joe Orton 2.3-2 - various cleanups; require perl(Newt) throughout not newt-perl Index: crypto-utils.spec =================================================================== RCS file: /cvs/dist/rpms/crypto-utils/devel/crypto-utils.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- crypto-utils.spec 17 Aug 2006 15:16:56 -0000 1.26 +++ crypto-utils.spec 1 Mar 2007 09:12:29 -0000 1.27 @@ -4,7 +4,7 @@ Summary: SSL certificate and key management utilities Name: crypto-utils Version: 2.3 -Release: 1 +Release: 2 Source: crypto-rand-%{crver}.tar.gz Source1: genkey.pl Source2: certwatch.c @@ -14,9 +14,9 @@ Source6: keyrand.c Group: Applications/System License: Various -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: openssl-devel, perl, pkgconfig, newt-devel, xmlto -Requires: newt-perl, openssl >= 0.9.7f-4 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: openssl-devel, perl, pkgconfig, newt-devel, xmlto, perl(Newt) +Requires: perl(Newt), openssl >= 0.9.7f-4 Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") Obsoletes: crypto-rand @@ -28,7 +28,7 @@ %setup -q -n crypto-rand-%{crver} %build -%configure --with-newt=%{_prefix} CFLAGS="-fPIC $RPM_OPT_FLAGS -Wall" +%configure --with-newt=%{_prefix} CFLAGS="$CFLAGS -fPIC" make -C librand cc $RPM_OPT_FLAGS -Wall -Werror -I/usr/include/openssl \ @@ -43,7 +43,7 @@ pushd Makerand perl -pi -e "s/Stronghold/Crypt/g" * -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr OPTIMIZE="$RPM_OPT_FLAGS" INSTALLDIRS=vendor make popd @@ -54,21 +54,11 @@ make install popd -# fix Newt.so perms -find $RPM_BUILD_ROOT/usr -name Makerand.so | xargs chmod 755 - -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +find $RPM_BUILD_ROOT -name Makerand.so | xargs chmod 755 find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; - -find $RPM_BUILD_ROOT/usr -type f -print | - sed "s@^$RPM_BUILD_ROOT@@g" | - grep -v perllocal.pod | - grep -v "\.packlist" > filelist -if [ ! -s filelist ] ; then - echo "ERROR: EMPTY FILE LIST" - exit 1 -fi +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily \ $RPM_BUILD_ROOT%{_mandir}/man1 \ @@ -96,16 +86,23 @@ -e "/@EXTRA@/d" \ < $RPM_SOURCE_DIR/genkey.pl > $RPM_BUILD_ROOT%{_bindir}/genkey +chmod -R u+w $RPM_BUILD_ROOT + %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -%files -f filelist -%defattr(0644,root,root,0755) +%files +%defattr(-,root,root) %attr(0755,root,root) %{_bindir}/* %attr(0755,root,root) %{_sysconfdir}/cron.daily/certwatch -%{_mandir}/man1/*.1* +%{_mandir}/man*/* +%{perl_vendorarch}/Crypt +%{perl_vendorarch}/auto/Crypt %changelog +* Thu Mar 1 2007 Joe Orton 2.3-2 +- various cleanups; require perl(Newt) throughout not newt-perl + * Thu Aug 17 2006 Joe Orton 2.3-1 - add GPL-licensed keyrand replacement (#20254) From fedora-cvs-commits at redhat.com Thu Mar 1 09:15:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 04:15:30 -0500 Subject: rpms/newt-perl/devel newt-perl.spec,1.16,1.17 Message-ID: <200703010915.l219FU1r030608@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/newt-perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30514 Modified Files: newt-perl.spec Log Message: - require perl-devel Index: newt-perl.spec =================================================================== RCS file: /cvs/dist/rpms/newt-perl/devel/newt-perl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- newt-perl.spec 1 Mar 2007 08:52:26 -0000 1.16 +++ newt-perl.spec 1 Mar 2007 09:15:28 -0000 1.17 @@ -11,7 +11,7 @@ Patch2: newt-perl-1.08-fix.patch Patch3: newt-perl-1.08-xs.patch Patch4: newt-perl-1.08-lang.patch -BuildRequires: newt-devel, perl +BuildRequires: newt-devel, perl, perl-devel Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") License: GPL or Artistic @@ -54,6 +54,7 @@ %changelog * Thu Mar 1 2007 Joe Orton 1.08-14 - various cleanups (Jason Tibbs, #226196) +- require perl-devel * Tue Feb 27 2007 Joe Orton 1.08-13 - clean up URL, Source, BuildRoot, BuildRequires From fedora-cvs-commits at redhat.com Thu Mar 1 09:30:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 04:30:48 -0500 Subject: rpms/binutils/devel binutils-2.17.50.0.12-build-fixes.patch, NONE, 1.1 binutils-2.17.50.0.12-ia64-lib64.patch, NONE, 1.1 binutils-2.17.50.0.12-ltconfig-multilib.patch, NONE, 1.1 binutils-2.17.50.0.12-place-orphan.patch, NONE, 1.1 binutils-2.17.50.0.12-ppc64-pie.patch, NONE, 1.1 binutils-2.17.50.0.12-standards.patch, NONE, 1.1 binutils-2.17.50.0.12-symbolic-envvar-revert.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 binutils.spec, 1.110, 1.111 sources, 1.32, 1.33 binutils-2.17.50.0.9-build-fixes.patch, 1.1, NONE binutils-2.17.50.0.9-ia64-lib64.patch, 1.1, NONE binutils-2.17.50.0.9-ltconfig-multilib.patch, 1.1, NONE binutils-2.17.50.0.9-place-orphan.patch, 1.1, NONE binutils-2.17.50.0.9-ppc64-pie.patch, 1.1, NONE binutils-2.17.50.0.9-standards.patch, 1.1, NONE binutils-2.17.50.0.9-tekhex.patch, 1.2, NONE Message-ID: <200703010930.l219UmFQ002367@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2311 Modified Files: .cvsignore binutils.spec sources Added Files: binutils-2.17.50.0.12-build-fixes.patch binutils-2.17.50.0.12-ia64-lib64.patch binutils-2.17.50.0.12-ltconfig-multilib.patch binutils-2.17.50.0.12-place-orphan.patch binutils-2.17.50.0.12-ppc64-pie.patch binutils-2.17.50.0.12-standards.patch binutils-2.17.50.0.12-symbolic-envvar-revert.patch Removed 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 Log Message: 2.17.50.0.12 binutils-2.17.50.0.12-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.12-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.12-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.12-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.12-ltconfig-multilib.patch: ltconfig | 17 +++++++++++++++++ 1 files changed, 17 insertions(+) --- NEW FILE binutils-2.17.50.0.12-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.12-place-orphan.patch: elf64ppc.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE binutils-2.17.50.0.12-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.12-ppc64-pie.patch: elf64-ppc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE binutils-2.17.50.0.12-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.12-standards.patch: standards.texi | 493 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 322 insertions(+), 171 deletions(-) --- NEW FILE binutils-2.17.50.0.12-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.12-symbolic-envvar-revert.patch: NEWS | 3 --- ld.texinfo | 11 ++--------- ldmain.c | 7 +------ 3 files changed, 3 insertions(+), 18 deletions(-) --- NEW FILE binutils-2.17.50.0.12-symbolic-envvar-revert.patch --- --- ld/NEWS.jj 2007-01-28 11:49:31.000000000 -0500 +++ ld/NEWS 2007-03-01 04:21:37.000000000 -0500 @@ -1,7 +1,4 @@ -*- text -*- -* ELF: Support environment variables, LD_SYMBOLIC for -Bsymbolic and - LD_SYMBOLIC_FUNCTIONS for -Bsymbolic-functions. - * Add a new command line option '--default-script=FILE' or '-dT FILE' which specifies a replacement for the built in, default linker script. --- ld/ld.texinfo.jj 2007-01-28 11:49:31.000000000 -0500 +++ ld/ld.texinfo 2007-03-01 04:25:24.000000000 -0500 @@ -1144,21 +1144,14 @@ When creating a shared library, bind ref definition within the shared library, if any. Normally, it is possible for a program linked against a shared library to override the definition within the shared library. This option is only meaningful on ELF -platforms which support shared libraries. If @option{-Bsymbolic} is not -used when linking a shared library, the linker will also turn on this -option if the environment variable @code{LD_SYMBOLIC} is set. +platforms which support shared libraries. @kindex -Bsymbolic-functions @item -Bsymbolic-functions When creating a shared library, bind references to global function symbols to the definition within the shared library, if any. This option is only meaningful on ELF platforms which support shared -libraries. If @option{-Bsymbolic-functions} is not used when linking a -shared library, the linker will also turn on this option if the -environment variable @code{LD_SYMBOLIC_FUNCTIONS} is set. When -both environment variables @code{LD_SYMBOLIC} and - at code{LD_SYMBOLIC_FUNCTIONS} are set, @code{LD_SYMBOLIC} will take -precedent. +libraries. @kindex --dynamic-list=@var{dynamic-list-file} @item --dynamic-list=@var{dynamic-list-file} --- ld/ldmain.c.jj 2007-01-28 11:49:31.000000000 -0500 +++ ld/ldmain.c 2007-03-01 04:22:40.000000000 -0500 @@ -256,12 +256,7 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.check_section_addresses = TRUE; command_line.accept_unknown_input_arch = FALSE; - if (getenv ("LD_SYMBOLIC") != NULL) - command_line.symbolic = symbolic; - else if (getenv ("LD_SYMBOLIC_FUNCTIONS") != NULL) - command_line.symbolic = symbolic_functions; - else - command_line.symbolic = symbolic_unset; + command_line.symbolic = symbolic_unset; command_line.dynamic_list = dynamic_list_unset; sort_section = none; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 8 Jan 2007 14:07:37 -0000 1.31 +++ .cvsignore 1 Mar 2007 09:30:45 -0000 1.32 @@ -1 +1 @@ -binutils-2.17.50.0.9.tar.bz2 +binutils-2.17.50.0.12.tar.bz2 Index: binutils.spec =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- binutils.spec 8 Jan 2007 14:11:22 -0000 1.110 +++ binutils.spec 1 Mar 2007 09:30:46 -0000 1.111 @@ -1,18 +1,18 @@ Summary: A GNU collection of binary utilities. Name: binutils -Version: 2.17.50.0.9 +Version: 2.17.50.0.12 Release: 1 License: GPL 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.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 +Patch1: binutils-2.17.50.0.12-ltconfig-multilib.patch +Patch2: binutils-2.17.50.0.12-ppc64-pie.patch +Patch3: binutils-2.17.50.0.12-place-orphan.patch +Patch4: binutils-2.17.50.0.12-ia64-lib64.patch +Patch5: binutils-2.17.50.0.12-standards.patch +Patch6: binutils-2.17.50.0.12-build-fixes.patch +Patch7: binutils-2.17.50.0.12-symbolic-envvar-revert.patch Buildroot: %{_tmppath}/binutils-root BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison @@ -203,6 +203,11 @@ %{_infodir}/bfd*info* %changelog +* Thu Mar 1 2007 Jakub Jelinek 2.17.50.0.12-1 +- update to 2.17.50.0.12 +- revert the misdesigned LD_SYMBOLIC{,_FUNCTIONS} env var support, + only support -Bsymbolic/-Bsymbolic-functions/--dynamic-list* + * Mon Jan 8 2007 Jakub Jelinek 2.17.50.0.9-1 - update to 2.17.50.0.9 - fix tekhex reader Index: sources =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 8 Jan 2007 14:07:37 -0000 1.32 +++ sources 1 Mar 2007 09:30:46 -0000 1.33 @@ -1 +1 @@ -708a922277d9bfc98e584038e5dc5d92 binutils-2.17.50.0.9.tar.bz2 +6f3e83399b965d70008860f697c50ec2 binutils-2.17.50.0.12.tar.bz2 --- binutils-2.17.50.0.9-build-fixes.patch DELETED --- --- binutils-2.17.50.0.9-ia64-lib64.patch DELETED --- --- binutils-2.17.50.0.9-ltconfig-multilib.patch DELETED --- --- binutils-2.17.50.0.9-place-orphan.patch DELETED --- --- binutils-2.17.50.0.9-ppc64-pie.patch DELETED --- --- binutils-2.17.50.0.9-standards.patch DELETED --- --- binutils-2.17.50.0.9-tekhex.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 1 09:33:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 04:33:40 -0500 Subject: rpms/readahead/devel sources,1.4,1.5 Message-ID: <200703010933.l219XeKc004438@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/readahead/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4395 Modified Files: sources Log Message: convert lists to arch independent format Index: sources =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Feb 2007 14:16:49 -0000 1.4 +++ sources 1 Mar 2007 09:33:38 -0000 1.5 @@ -1,3 +1,3 @@ 30639d2368ca2e3affb36d18c8206467 readahead-1.4.tar.bz2 -da64e0d8a86baa5a0c79102be53c3607 default.early -cfb7dce7818d6b92c7d42ec8bf1db1a1 default.later +4602d7d85013d09068cc13e11032adb6 default.early +bca200a779fe5dd6aa134459c6ab0c16 default.later From fedora-cvs-commits at redhat.com Thu Mar 1 09:41:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 04:41:19 -0500 Subject: rpms/crypto-utils/devel crypto-utils.spec,1.27,1.28 Message-ID: <200703010941.l219fJlB000867@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/crypto-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv841 Modified Files: crypto-utils.spec Log Message: - require perl-devel Index: crypto-utils.spec =================================================================== RCS file: /cvs/dist/rpms/crypto-utils/devel/crypto-utils.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- crypto-utils.spec 1 Mar 2007 09:12:29 -0000 1.27 +++ crypto-utils.spec 1 Mar 2007 09:41:15 -0000 1.28 @@ -15,7 +15,7 @@ Group: Applications/System License: Various BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: openssl-devel, perl, pkgconfig, newt-devel, xmlto, perl(Newt) +BuildRequires: openssl-devel, perl-devel, pkgconfig, newt-devel, xmlto, perl(Newt) Requires: perl(Newt), openssl >= 0.9.7f-4 Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") Obsoletes: crypto-rand From fedora-cvs-commits at redhat.com Thu Mar 1 09:49:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 04:49:00 -0500 Subject: rpms/readahead/FC-6 .cvsignore, 1.2, 1.3 default.early.in, 1.4, 1.5 default.later.in, 1.4, 1.5 readahead.spec, 1.35, 1.36 sources, 1.3, 1.4 Message-ID: <200703010949.l219n0Gk026619@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/readahead/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26602 Modified Files: .cvsignore default.early.in default.later.in readahead.spec sources Log Message: * Thu Mar 1 2007 Karel Zak - 1:1.3-7 - new lists (generated by readahead-1.4) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Sep 2006 21:22:12 -0000 1.2 +++ .cvsignore 1 Mar 2007 09:48:58 -0000 1.3 @@ -1 +1,3 @@ readahead-1.3.tar.gz +default.early.in +default.later.in Index: default.early.in =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-6/default.early.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- default.early.in 2 Feb 2007 00:05:11 -0000 1.4 +++ default.early.in 1 Mar 2007 09:48:58 -0000 1.5 @@ -1,65 +1,3 @@ -/%{_lib}/iptables/libipt_REJECT.so -/%{_lib}/iptables/libipt_icmp.so -/%{_lib}/iptables/libipt_standard.so -/%{_lib}/iptables/libipt_state.so -/%{_lib}/iptables/libipt_tcp.so -/%{_lib}/iptables/libipt_udp.so -/%{_lib}/ld-linux-x86-64.so.2 -/%{_lib}/libacl.so.1 -/%{_lib}/libasound.so.2 -/%{_lib}/libattr.so.1 -/%{_lib}/libaudit.so.0 -/%{_lib}/libblkid.so.1 -/%{_lib}/libc.so.6 -/%{_lib}/libcom_err.so.2 -/%{_lib}/libcrypt.so.1 -/%{_lib}/libcrypto.so.6 -/%{_lib}/libdb-4.3.so -/%{_lib}/libdbus-1.so.3 -/%{_lib}/libdl.so.2 -/%{_lib}/libexpat.so.0 -/%{_lib}/libglib-2.0.so.0 -/%{_lib}/libgmodule-2.0.so.0 -/%{_lib}/libgobject-2.0.so.0 -/%{_lib}/libgthread-2.0.so.0 -/%{_lib}/libiw.so.28 -/%{_lib}/libm.so.6 -/%{_lib}/libnsl.so.1 -/%{_lib}/libnss_dns.so.2 -/%{_lib}/libnss_files.so.2 -/%{_lib}/libnss_hesiod.so.2 -/%{_lib}/libpam.so.0 -/%{_lib}/libpam_misc.so.0 -/%{_lib}/libpcre.so.0 -/%{_lib}/libproc-3.2.7.so -/%{_lib}/libpthread.so.0 -/%{_lib}/libresolv.so.2 -/%{_lib}/librt.so.1 -/%{_lib}/libselinux.so.1 -/%{_lib}/libssl.so.6 -/%{_lib}/libtermcap.so.2 -/%{_lib}/libutil.so.1 -/%{_lib}/libuuid.so.1 -/%{_lib}/security/../../lib/security/pam_cracklib.so -/%{_lib}/security/../../lib/security/pam_deny.so -/%{_lib}/security/../../lib/security/pam_env.so -/%{_lib}/security/../../lib/security/pam_krb5.so -/%{_lib}/security/../../lib/security/pam_limits.so -/%{_lib}/security/../../lib/security/pam_permit.so -/%{_lib}/security/../../lib/security/pam_succeed_if.so -/%{_lib}/security/../../lib/security/pam_unix.so -/%{_lib}/security/pam_console.so -/%{_lib}/security/pam_deny.so -/%{_lib}/security/pam_env.so -/%{_lib}/security/pam_nologin.so -/%{_lib}/security/pam_securetty.so -/%{_lib}/security/pam_selinux.so -/%{_lib}/security/pam_stack.so -/lib/udev/MAKEDEV.dev -/lib/udev/check-cdrom.sh -/lib/udev/ide-media.sh -/lib/udev/pam_console.dev -/bin/awk /bin/basename /bin/bash /bin/cat @@ -70,9 +8,9 @@ /bin/date /bin/dbus-daemon /bin/dd +/bin/df /bin/dmesg -/bin/egrep -/bin/fgrep +/bin/gawk /bin/grep /bin/gzip /bin/hostname @@ -83,23 +21,29 @@ /bin/mkdir /bin/mktemp /bin/mount +/bin/netstat /bin/nice /bin/rm /bin/sed -/bin/sh /bin/sleep /bin/sort /bin/touch /bin/true /bin/umount /bin/uname +/bin/unicode_start /etc/DIR_COLORS +/etc/DIR_COLORS.xterm +/etc/X11/Xmodmap /etc/X11/Xresources /etc/X11/fs/config -/etc/X11/gdm/Init/:0 -/etc/X11/gdm/gdm.conf /etc/X11/prefdm -/etc/X11/xdm/Xsetup_0 +/etc/X11/xinit/Xclients +/etc/X11/xinit/Xsession +/etc/X11/xinit/xinitrc-common +/etc/X11/xinit/xinitrc.d/localuser.sh +/etc/X11/xinit/xinitrc.d/xinput.sh +/etc/X11/xinit/xinput.d/none.conf /etc/X11/xorg.conf /etc/acpi/events/power.conf /etc/acpi/events/video.conf @@ -107,35 +51,286 @@ /etc/aliases.db /etc/alsa/alsa.conf /etc/anacrontab -/etc/asound.state /etc/auto.master +/etc/avahi/avahi-daemon.conf +/etc/avahi/etc/localtime /etc/bashrc /etc/blkid/blkid.tab /etc/bluetooth/hcid.conf /etc/bluetooth/rfcomm.conf +/etc/bonobo-activation/bonobo-activation-config.xml /etc/cpuspeed.conf /etc/crontab /etc/cups/classes.conf +/etc/cups/client.conf /etc/cups/cupsd.conf /etc/cups/mime.convs /etc/cups/mime.types /etc/cups/printers.conf /etc/cups/pstoraster.convs +/etc/dbus-1/session.conf /etc/dbus-1/system.conf /etc/dbus-1/system.d/NetworkManager.conf +/etc/dbus-1/system.d/avahi-dbus.conf +/etc/dbus-1/system.d/bluez-hcid.conf /etc/dbus-1/system.d/cups.conf +/etc/dbus-1/system.d/dhcdbd.conf +/etc/dbus-1/system.d/gnome-power-manager.conf /etc/dbus-1/system.d/hal.conf +/etc/dbus-1/system.d/nm-applet.conf /etc/dbus-1/system.d/printdriverselector.conf +/etc/dbus-1/system.d/yum-updatesd.conf +/etc/environment +/etc/fedora-release +/etc/fonts/conf.avail/20-fix-globaladvance.conf +/etc/fonts/conf.avail/20-lohit-gujarati.conf +/etc/fonts/conf.avail/20-unhint-small-vera.conf +/etc/fonts/conf.avail/30-amt-aliases.conf +/etc/fonts/conf.avail/30-urw-aliases.conf +/etc/fonts/conf.avail/40-generic.conf +/etc/fonts/conf.avail/49-sansserif.conf +/etc/fonts/conf.avail/50-user.conf +/etc/fonts/conf.avail/51-local.conf +/etc/fonts/conf.avail/60-latin.conf +/etc/fonts/conf.avail/65-fonts-persian.conf +/etc/fonts/conf.avail/65-nonlatin.conf +/etc/fonts/conf.avail/69-unifont.conf +/etc/fonts/conf.avail/80-delicious.conf +/etc/fonts/conf.avail/90-synthetic.conf +/etc/fonts/conf.d/25-no-hint-fedora.conf +/etc/fonts/conf.d/30-aliases-fedora.conf +/etc/fonts/conf.d/40-generic-fedora.conf +/etc/fonts/conf.d/59-dejavu-lgc-fonts.conf +/etc/fonts/conf.d/64-nonlatin-fedora.conf +/etc/fonts/conf.d/75-blacklist-fedora.conf /etc/fonts/fonts.conf /etc/fstab +/etc/gconf/2/evoldap.conf +/etc/gconf/2/path +/etc/gconf/gconf.xml.defaults/%gconf-tree-af.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-am.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ar.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-az.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-be.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-bg.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-bn.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-bn_IN.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-br.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-bs.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ca.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-cs.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-cy.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-da.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-de.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-dz.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-el.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-en_CA.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-eo.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_AR.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_CL.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_CO.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_CR.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_DO.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_EC.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_ES.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_GT.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_HN.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_MX.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_NI.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_PA.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_PE.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_PR.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_SV.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_UY.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-es_VE.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-et.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-eu.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-fa.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-fi.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-fr.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ga.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-gl.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-gu.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-he.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-hi.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-hr.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-hu.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-hy.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-id.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-is.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-it.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ja.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ka.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-km.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ko.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ku.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ky.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-li.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-lt.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-lv.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-mg.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-mk.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ml.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-mn.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-mr.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ms.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-nb.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ne.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-nl.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-nn.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-no.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-nso.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-or.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-pa.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-pl.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-pt.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-pt_BR.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ro.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-rw.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-sk.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-sl.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-sq.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-sr.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-sr at Latn.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-sr at ije.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-sv.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ta.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-te.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-th.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-tk.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-tr.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-tt.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-ug.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-uk.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-vi.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-wa.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-xh.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-yi.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-zh_CN.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-zh_HK.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-zh_TW.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree-zu.xml +/etc/gconf/gconf.xml.defaults/%gconf-tree.xml +/etc/gconf/schemas/CDDB-Slave2.schemas +/etc/gconf/schemas/apps-evolution-mail-prompts-checkdefault-2.8.schemas +/etc/gconf/schemas/apps_evolution_addressbook-2.8.schemas +/etc/gconf/schemas/apps_evolution_calendar-2.8.schemas +/etc/gconf/schemas/apps_evolution_shell-2.8.schemas +/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas +/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas +/etc/gconf/schemas/apps_gnome_settings_daemon_power_manager.schemas +/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas +/etc/gconf/schemas/apps_nautilus_preferences.schemas +/etc/gconf/schemas/baobab.schemas +/etc/gconf/schemas/battstat.schemas +/etc/gconf/schemas/cdda-url-handler.schemas +/etc/gconf/schemas/charpick.schemas +/etc/gconf/schemas/clock.schemas +/etc/gconf/schemas/cpufreq-applet.schemas +/etc/gconf/schemas/desktop_default_applications.schemas +/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas +/etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas +/etc/gconf/schemas/desktop_gnome_applications_browser.schemas +/etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas +/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas +/etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas +/etc/gconf/schemas/desktop_gnome_background.schemas +/etc/gconf/schemas/desktop_gnome_file_sharing.schemas +/etc/gconf/schemas/desktop_gnome_file_views.schemas +/etc/gconf/schemas/desktop_gnome_font_rendering.schemas +/etc/gconf/schemas/desktop_gnome_interface.schemas +/etc/gconf/schemas/desktop_gnome_lockdown.schemas +/etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas +/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas +/etc/gconf/schemas/desktop_gnome_peripherals_monitor.schemas +/etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas +/etc/gconf/schemas/desktop_gnome_sound.schemas +/etc/gconf/schemas/desktop_gnome_thumbnailers.schemas +/etc/gconf/schemas/desktop_gnome_typing_break.schemas +/etc/gconf/schemas/desktop_gnome_url_handlers.schemas +/etc/gconf/schemas/drivemount.schemas +/etc/gconf/schemas/eggcups.schemas +/etc/gconf/schemas/ekiga.schemas +/etc/gconf/schemas/eog.schemas +/etc/gconf/schemas/evince-thumbnailer.schemas +/etc/gconf/schemas/evince.schemas +/etc/gconf/schemas/evolution-mail-2.8.schemas +/etc/gconf/schemas/evolution-webcal.schemas +/etc/gconf/schemas/file-roller.schemas +/etc/gconf/schemas/filebrowser.schemas +/etc/gconf/schemas/fish.schemas +/etc/gconf/schemas/fontilus.schemas +/etc/gconf/schemas/gcalctool.schemas +/etc/gconf/schemas/gedit.schemas +/etc/gconf/schemas/geyes.schemas +/etc/gconf/schemas/gfloppy.schemas +/etc/gconf/schemas/gnome-audio-profiles.schemas +/etc/gconf/schemas/gnome-cd.schemas +/etc/gconf/schemas/gnome-dictionary.schemas +/etc/gconf/schemas/gnome-mount.schemas +/etc/gconf/schemas/gnome-power-manager.schemas +/etc/gconf/schemas/gnome-screensaver.schemas +/etc/gconf/schemas/gnome-screenshot.schemas +/etc/gconf/schemas/gnome-search-tool.schemas +/etc/gconf/schemas/gnome-session.schemas +/etc/gconf/schemas/gnome-system-monitor.schemas +/etc/gconf/schemas/gnome-terminal.schemas +/etc/gconf/schemas/gnome-volume-control.schemas +/etc/gconf/schemas/gnome-volume-manager.schemas +/etc/gconf/schemas/gok.schemas +/etc/gconf/schemas/gsf-office-thumbnailer.schemas +/etc/gconf/schemas/gstreamer-0.10.schemas +/etc/gconf/schemas/gswitchit.schemas +/etc/gconf/schemas/gthumb.schemas +/etc/gconf/schemas/gweather.schemas +/etc/gconf/schemas/logview.schemas +/etc/gconf/schemas/metacity.schemas +/etc/gconf/schemas/mini-commander-global.schemas +/etc/gconf/schemas/mini-commander.schemas +/etc/gconf/schemas/mixer.schemas +/etc/gconf/schemas/modemlights.schemas +/etc/gconf/schemas/multiload.schemas +/etc/gconf/schemas/nautilus-cd-burner.schemas +/etc/gconf/schemas/netstatus.schemas +/etc/gconf/schemas/notification-daemon.schemas +/etc/gconf/schemas/pager.schemas +/etc/gconf/schemas/panel-compatibility.schemas +/etc/gconf/schemas/panel-default-setup.entries +/etc/gconf/schemas/panel-general.schemas +/etc/gconf/schemas/panel-global.schemas +/etc/gconf/schemas/panel-object.schemas +/etc/gconf/schemas/panel-toplevel.schemas +/etc/gconf/schemas/pilot.schemas +/etc/gconf/schemas/stickynotes.schemas +/etc/gconf/schemas/system_dns_sd.schemas +/etc/gconf/schemas/system_http_proxy.schemas +/etc/gconf/schemas/system_smb.schemas +/etc/gconf/schemas/tasklist.schemas +/etc/gconf/schemas/themus.schemas +/etc/gconf/schemas/tomboy.schemas +/etc/gconf/schemas/vino-server.schemas +/etc/gconf/schemas/window-list.schemas +/etc/gconf/schemas/workspace-switcher.schemas +/etc/gconf/schemas/yelp.schemas +/etc/gdm/Init/Default +/etc/gdm/PreSession/Default +/etc/gdm/custom.conf +/etc/gdm/securitytokens.conf +/etc/gnome-vfs-2.0/modules/default-modules.conf +/etc/gnome-vfs-2.0/modules/font-method.conf +/etc/gnome-vfs-2.0/modules/mapping-modules.conf +/etc/gnome-vfs-2.0/modules/smb-module.conf +/etc/gnome-vfs-2.0/modules/ssl-modules.conf +/etc/gnome-vfs-2.0/modules/theme-method.conf /etc/group /etc/gtk-2.0/gtkrc -/etc/gtk-2.0/i686-redhat-linux-gnu/gdk-pixbuf.loaders -/etc/gtk-2.0/i686-redhat-linux-gnu/gtk.immodules /etc/host.conf /etc/hosts +/etc/hp/hplip.conf /etc/idmapd.conf -/etc/init.d/functions /etc/inittab /etc/inputrc /etc/iproute2/rt_scopes @@ -143,6 +338,7 @@ /etc/krb5.conf /etc/ld.so.cache /etc/localtime +/etc/lvm/.cache /etc/lvm/lvm.conf /etc/mail/Makefile /etc/mail/local-host-names @@ -174,19 +370,25 @@ /etc/makedev.d/01std /etc/makedev.d/01undocumented /etc/makedev.d/01v4l +/etc/mime.types /etc/modprobe.conf +/etc/modprobe.d/blacklist +/etc/modprobe.d/blacklist-compat /etc/modprobe.d/modprobe.conf.dist +/etc/mono/1.0/machine.config +/etc/mono/config /etc/motd /etc/mtab +/etc/multipath.conf /etc/nsswitch.conf /etc/openldap/ldap.conf /etc/pam.d/gdm /etc/pam.d/login /etc/pam.d/other -/etc/pam.d/system-auth -/etc/pango/i686-redhat-linux-gnu/pango.modules +/etc/pam.d/pup +/etc/pam.d/system-auth-ac /etc/passwd -/etc/pcmcia/config.opts +/etc/pki/nssdb/secmod.db /etc/printcap /etc/profile /etc/profile.d/colorls.sh @@ -195,633 +397,252 @@ /etc/profile.d/krb5.sh /etc/profile.d/lang.sh /etc/profile.d/less.sh +/etc/profile.d/mc.sh +/etc/profile.d/vim.sh /etc/profile.d/which-2.sh /etc/protocols +/etc/rc.d/init.d/NetworkManager +/etc/rc.d/init.d/NetworkManagerDispatcher +/etc/rc.d/init.d/acpid +/etc/rc.d/init.d/anacron +/etc/rc.d/init.d/atd +/etc/rc.d/init.d/auditd +/etc/rc.d/init.d/autofs +/etc/rc.d/init.d/avahi-daemon /etc/rc.d/init.d/bluetooth +/etc/rc.d/init.d/cpuspeed /etc/rc.d/init.d/crond /etc/rc.d/init.d/cups /etc/rc.d/init.d/cups-config-daemon +/etc/rc.d/init.d/diskdump +/etc/rc.d/init.d/firstboot /etc/rc.d/init.d/functions +/etc/rc.d/init.d/gpm /etc/rc.d/init.d/haldaemon +/etc/rc.d/init.d/hidd +/etc/rc.d/init.d/hplip +/etc/rc.d/init.d/ip6tables +/etc/rc.d/init.d/iptables +/etc/rc.d/init.d/irda +/etc/rc.d/init.d/irqbalance +/etc/rc.d/init.d/kudzu +/etc/rc.d/init.d/mcstrans +/etc/rc.d/init.d/mdmonitor +/etc/rc.d/init.d/mdmpd /etc/rc.d/init.d/messagebus +/etc/rc.d/init.d/netdump +/etc/rc.d/init.d/netfs +/etc/rc.d/init.d/netplugd +/etc/rc.d/init.d/network +/etc/rc.d/init.d/nfs /etc/rc.d/init.d/nfslock -/etc/rc.d/init.d/rpcidmapd +/etc/rc.d/init.d/nscd +/etc/rc.d/init.d/ntpd +/etc/rc.d/init.d/pcscd +/etc/rc.d/init.d/portmap +/etc/rc.d/init.d/psacct +/etc/rc.d/init.d/rdisc +/etc/rc.d/init.d/readahead_early +/etc/rc.d/init.d/readahead_later /etc/rc.d/rc /etc/rc.d/rc.sysinit -/etc/rc.d/rc5.d/S14nfslock -/etc/rc.d/rc5.d/S18rpcidmapd -/etc/rc.d/rc5.d/S22messagebus -/etc/rc.d/rc5.d/S25bluetooth -/etc/rc.d/rc5.d/S55cups -/etc/rc.d/rc5.d/S90crond -/etc/rc.d/rc5.d/S98haldaemon -/etc/rc5.d/K05saslauthd -/etc/rc5.d/K10psacct -/etc/rc5.d/K20nfs -/etc/rc5.d/K24irda -/etc/rc5.d/K30spamassassin -/etc/rc5.d/K35vncserver -/etc/rc5.d/K35winbind -/etc/rc5.d/K50netdump -/etc/rc5.d/K69rpcsvcgssd -/etc/rc5.d/K73ypbind -/etc/rc5.d/K74nscd -/etc/rc5.d/K74ntpd -/etc/rc5.d/K85mdmpd -/etc/rc5.d/K87named -/etc/rc5.d/K89netplugd -/etc/rc5.d/K89rdisc -/etc/rc5.d/K94diskdump -/etc/rc5.d/S05kudzu -/etc/rc5.d/S06cpuspeed -/etc/rc5.d/S08iptables -/etc/rc5.d/S09isdn -/etc/rc5.d/S09pcmcia -/etc/rc5.d/S10network -/etc/rc5.d/S12syslog -/etc/rc5.d/S13portmap -/etc/rc5.d/S14nfslock -/etc/rc5.d/S15mdmonitor -/etc/rc5.d/S18rpcidmapd -/etc/rc5.d/S19rpcgssd -/etc/rc5.d/S22messagebus -/etc/rc5.d/S25bluetooth -/etc/rc5.d/S25netfs -/etc/rc5.d/S28autofs -/etc/rc5.d/S33nifd -/etc/rc5.d/S44acpid -/etc/rc5.d/S55cups -/etc/rc5.d/S55sshd -/etc/rc5.d/S80sendmail -/etc/rc5.d/S85gpm -/etc/rc5.d/S90crond -/etc/rc5.d/S90xfs -/etc/rc5.d/S95anacron -/etc/rc5.d/S95atd -/etc/rc5.d/S97rhnsd -/etc/rc5.d/S98cups-config-daemon -/etc/rc5.d/S98haldaemon -/etc/rc5.d/S99firstboot -/etc/rc5.d/S99local -/etc/redhat-release -/etc/resolv.conf -/etc/rpc -/etc/securetty +/etc/readahead.d/custom.early /etc/security/console.perms /etc/security/console.perms.d/50-default.perms -/etc/security/limits.conf -/etc/security/pam_env.conf /etc/selinux/config -/etc/selinux/targeted/contexts/customizable_types -/etc/selinux/targeted/contexts/dbus_contexts -/etc/selinux/targeted/contexts/default_contexts -/etc/selinux/targeted/contexts/files/file_contexts -/etc/selinux/targeted/contexts/files/file_contexts.homedirs -/etc/selinux/targeted/contexts/files/media -/etc/selinux/targeted/contexts/removable_context -/etc/selinux/targeted/contexts/users/root -/etc/services -/etc/shadow -/etc/ssh/ssh_host_dsa_key -/etc/ssh/ssh_host_key -/etc/ssh/ssh_host_rsa_key -/etc/ssh/sshd_config -/etc/sysconfig/autofs -/etc/sysconfig/bluetooth -/etc/sysconfig/crond -/etc/sysconfig/desktop -/etc/sysconfig/firstboot -/etc/sysconfig/hwconf +/etc/sysconfig/clock /etc/sysconfig/i18n /etc/sysconfig/init -/etc/sysconfig/iptables -/etc/sysconfig/iptables-config /etc/sysconfig/keyboard /etc/sysconfig/kudzu -/etc/sysconfig/mouse +/etc/sysconfig/modules/udev-stw.modules /etc/sysconfig/network /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-lo -/etc/sysconfig/network-scripts/ifup-aliases -/etc/sysconfig/network-scripts/ifup-eth -/etc/sysconfig/network-scripts/ifup-post -/etc/sysconfig/network-scripts/ifup-routes +/etc/sysconfig/network-scripts/net.hotplug /etc/sysconfig/network-scripts/network-functions -/etc/sysconfig/pcmcia -/etc/sysconfig/sendmail -/etc/sysconfig/syslog +/etc/sysconfig/readonly-root /etc/sysctl.conf -/etc/syslog.conf -/etc/termcap +/etc/udev/makedev.d/50-udev.nodes +/etc/udev/rules.d/05-udev-early.rules +/etc/udev/rules.d/40-multipath.rules /etc/udev/rules.d/50-udev.rules +/etc/udev/rules.d/51-hotplug.rules +/etc/udev/rules.d/60-libsane.rules +/etc/udev/rules.d/60-net.rules +/etc/udev/rules.d/60-pcmcia.rules /etc/udev/rules.d/60-wacom.rules +/etc/udev/rules.d/90-alsa.rules +/etc/udev/rules.d/90-hal.rules +/etc/udev/rules.d/95-pam-console.rules +/etc/udev/rules.d/bluetooth.rules /etc/udev/udev.conf -/lib/kbd/keymaps/amiga/amiga-de.map.gz -/lib/kbd/keymaps/amiga/amiga-us.map.gz -/lib/kbd/keymaps/atari/atari-de.map.gz -/lib/kbd/keymaps/atari/atari-se.map.gz -/lib/kbd/keymaps/atari/atari-uk-falcon.map.gz -/lib/kbd/keymaps/atari/atari-us.map.gz -/lib/kbd/keymaps/i386/qwerty/../../include/compose.latin1 -/lib/kbd/keymaps/i386/qwerty/../include/compose.inc -/lib/kbd/keymaps/i386/qwerty/../include/euro1.map.gz -/lib/kbd/keymaps/i386/qwerty/../include/linux-keys-bare.inc -/lib/kbd/keymaps/i386/qwerty/../include/linux-with-alt-and-altgr.inc -/lib/kbd/keymaps/i386/qwerty/../include/qwerty-layout.inc +/lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz +/lib/kbd/keymaps/i386/include/compose.inc +/lib/kbd/keymaps/i386/include/euro1.map.gz +/lib/kbd/keymaps/i386/include/linux-keys-bare.inc +/lib/kbd/keymaps/i386/include/linux-with-alt-and-altgr.inc +/lib/kbd/keymaps/i386/include/qwerty-layout.inc /lib/kbd/keymaps/i386/qwerty/us.map.gz -/sbin/MAKEDEV -/sbin/alsactl -/sbin/arping -/sbin/auditctl -/sbin/pccardctl -/sbin/change_console -/sbin/consoletype -/sbin/dhclient -/sbin/ethtool -/sbin/findfs -/sbin/fixfiles -/sbin/fsck +/lib/kbd/keymaps/include/compose.latin1 +/lib/udev/load_floppy_module.sh +/lib/udev/modprobe +/lib/udev/path_id +/lib/udev/vol_id +/%{_lib}/libaudit.so.0.0.0 +/%{_lib}/libblkid.so.1.0 +/%{_lib}/libc-2.5.so +/%{_lib}/libcom_err.so.2.1 +/%{_lib}/libdevmapper.so.1.02 +/%{_lib}/libdl-2.5.so +/%{_lib}/libexpat.so.0.5.0 +/%{_lib}/libext2fs.so.2.4 +/%{_lib}/libglib-2.0.so.0.1200.9 +/%{_lib}/libgmodule-2.0.so.0.1200.9 +/%{_lib}/libgobject-2.0.so.0.1200.9 +/%{_lib}/libm-2.5.so +/%{_lib}/libnss_files-2.5.so +/%{_lib}/libpam.so.0.81.5 +/%{_lib}/libpcre.so.0.0.1 +/%{_lib}/libproc-3.2.7.so +/%{_lib}/libpthread-2.5.so +/%{_lib}/librt-2.5.so +/%{_lib}/libselinux.so.1 +/%{_lib}/libsepol.so.1 +/%{_lib}/libtermcap.so.2.0.8 +/%{_lib}/libutil-2.5.so +/%{_lib}/libuuid.so.1.2 +/sbin/dmraid.static /sbin/fsck.ext3 -/sbin/getkey -/sbin/hwclock -/sbin/ifconfig -/sbin/ifenslave -/sbin/insmod -/sbin/ip -/sbin/iptables -/sbin/iptables-restore -/sbin/iwconfig -/sbin/klogd -/sbin/kmodule -/sbin/lsmod /sbin/lvm.static -/sbin/mingetty -/sbin/modprobe +/sbin/multipath.static /sbin/nash -/sbin/pam_console_apply -/sbin/pidof -/sbin/portmap -/sbin/poweroff -/sbin/quotaon -/sbin/reboot -/sbin/restorecon -/sbin/rpc.statd -/sbin/runlevel -/sbin/runuser +/sbin/setsysfont /sbin/start_udev -/sbin/swapon -/sbin/sysctl -/sbin/syslogd -/sbin/udevd -/sbin/udevstart -/sbin/vconfig -/usr/%{_lib}/autofs/lookup_ldap.so -/usr/%{_lib}/autofs/mount_bind.so -/usr/%{_lib}/autofs/mount_nfs.so -/usr/%{_lib}/autofs/parse_sun.so -/usr/lib/cups/backend/hal -/usr/lib/cups/backend/http -/usr/lib/cups/backend/ipp -/usr/lib/cups/backend/lpd -/usr/lib/cups/backend/ncp -/usr/lib/cups/backend/parallel -/usr/lib/cups/backend/scsi -/usr/lib/cups/backend/serial -/usr/lib/cups/backend/smb -/usr/lib/cups/backend/socket -/usr/lib/cups/backend/usb -/usr/lib/cups/filter/hpgltops -/usr/lib/cups/filter/imagetops -/usr/lib/cups/filter/imagetoraster -/usr/lib/cups/filter/pdftops -/usr/lib/cups/filter/pstops -/usr/lib/cups/filter/pstoraster -/usr/lib/cups/filter/texttops +/usr/lib/locale/locale-archive /usr/%{_lib}/gconv/ISO8859-1.so /usr/%{_lib}/gconv/gconv-modules.cache /usr/%{_lib}/gtk-2.0/2.10.0/engines/libclearlooks.so /usr/%{_lib}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so -/usr/%{_lib}/libICE.so.6 -/usr/%{_lib}/libORBit-2.so.0 -/usr/%{_lib}/libORBitCosNaming-2.so.0 -/usr/%{_lib}/libSM.so.6 -/usr/%{_lib}/libX11.so.6 -/usr/%{_lib}/libXcursor.so.1 -/usr/%{_lib}/libXext.so.6 -/usr/%{_lib}/libXfixes.so.3 -/usr/%{_lib}/libXfont.so.1 -/usr/%{_lib}/libXft.so.2 -/usr/%{_lib}/libXi.so.6 -/usr/%{_lib}/libXinerama.so.1 -/usr/%{_lib}/libXmuu.so.1 -/usr/%{_lib}/libXrandr.so.2 -/usr/%{_lib}/libXrender.so.1 -/usr/%{_lib}/libalchemist.so.0 -/usr/%{_lib}/libart_lgpl_2.so.2 -/usr/%{_lib}/libatk-1.0.so.0 -/usr/%{_lib}/libbluetooth.so.2 -/usr/%{_lib}/libbonobo-2.so.0 -/usr/%{_lib}/libbonobo-activation.so.4 -/usr/%{_lib}/libbz2.so.1 -/usr/%{_lib}/libcrack.so.2 -/usr/%{_lib}/libcroco-0.6.so.3 -/usr/%{_lib}/libcups.so.2 -/usr/%{_lib}/libdbus-glib-1.so.2 -/usr/%{_lib}/libdes425.so.3 -/usr/%{_lib}/libfontconfig.so.1 -/usr/%{_lib}/libfreetype.so.6 -/usr/%{_lib}/libgconf-2.so.4 -/usr/%{_lib}/libgdk-x11-2.0.so.0 -/usr/%{_lib}/libgdk_pixbuf-2.0.so.0 -/usr/%{_lib}/libgnomecanvas-2.so.0 -/usr/%{_lib}/libgnomevfs-2.so.0 -/usr/%{_lib}/libgsf-1.so.114 -/usr/%{_lib}/libgssapi_krb5.so.2 -/usr/%{_lib}/libgtk-x11-2.0.so.0 -/usr/%{_lib}/libhal-storage.so.1 -/usr/%{_lib}/libhal.so.1 -/usr/%{_lib}/libhesiod.so.0 -/usr/%{_lib}/libk5crypto.so.3 -/usr/%{_lib}/libkrb4.so.2 -/usr/%{_lib}/libkrb5.so.3 -/usr/%{_lib}/libkrb5support.so.0 -/usr/%{_lib}/liblber-2.3.so.0 -/usr/%{_lib}/libldap-2.3.so.0 -/usr/%{_lib}/libncurses.so.5 -/usr/%{_lib}/libpango-1.0.so.0 -/usr/%{_lib}/libpangoft2-1.0.so.0 -/usr/%{_lib}/libpangox-1.0.so.0 -/usr/%{_lib}/libpangoxft-1.0.so.0 -/usr/%{_lib}/libpng12.so.0 -/usr/%{_lib}/libpopt.so.0 -/usr/%{_lib}/libpython2.4.so.1.0 -/usr/%{_lib}/librsvg-2.so.2 -/usr/%{_lib}/libsasl2.so.2 -/usr/%{_lib}/libusb-0.1.so.4 -/usr/%{_lib}/libvte.so.9 -/usr/%{_lib}/libwrap.so.0 -/usr/%{_lib}/libxkbfile.so.1 -/usr/%{_lib}/libxml2.so.2 -/usr/%{_lib}/libz.so.1 -/usr/lib/locale/locale-archive +/usr/%{_lib}/libICE.so.6.3.0 +/usr/%{_lib}/libSM.so.6.0.0 +/usr/%{_lib}/libX11.so.6.2.0 +/usr/%{_lib}/libXau.so.6.0.0 +/usr/%{_lib}/libXcursor.so.1.0.2 +/usr/%{_lib}/libXdmcp.so.6.0.0 +/usr/%{_lib}/libXext.so.6.4.0 +/usr/%{_lib}/libXfixes.so.3.1.0 +/usr/%{_lib}/libXfont.so.1.4.1 +/usr/%{_lib}/libXft.so.2.1.2 +/usr/%{_lib}/libXi.so.6.0.0 +/usr/%{_lib}/libXinerama.so.1.0.0 +/usr/%{_lib}/libXrandr.so.2.0.0 +/usr/%{_lib}/libXrender.so.1.3.0 +/usr/%{_lib}/libatk-1.0.so.0.1212.0 +/usr/%{_lib}/libcairo.so.2.9.3 +/usr/%{_lib}/libfontconfig.so.1.1.0 +/usr/%{_lib}/libfontenc.so.1.0.0 +/usr/%{_lib}/libfreetype.so.6.3.10 +/usr/%{_lib}/libgdk-x11-2.0.so.0.1000.8 +/usr/%{_lib}/libgdk_pixbuf-2.0.so.0.1000.8 +/usr/%{_lib}/libgtk-x11-2.0.so.0.1000.8 +/usr/%{_lib}/libncurses.so.5.5 +/usr/%{_lib}/libpango-1.0.so.0.1400.10 +/usr/%{_lib}/libpangocairo-1.0.so.0.1400.10 +/usr/%{_lib}/libpangoft2-1.0.so.0.1400.10 +/usr/%{_lib}/libpangox-1.0.so.0.1400.10 +/usr/%{_lib}/libpangoxft-1.0.so.0.1400.10 +/usr/%{_lib}/libpng12.so.0.10.0 +/usr/%{_lib}/libpopt.so.0.0.0 +/usr/%{_lib}/libvte.so.9.1.7 +/usr/%{_lib}/libxkbfile.so.1.0.2 +/usr/%{_lib}/libz.so.1.2.3 /usr/%{_lib}/pango/1.5.0/modules/pango-basic-fc.so -/usr/%{_lib}/python2.4/UserDict.py -/usr/%{_lib}/python2.4/UserDict.pyo -/usr/%{_lib}/python2.4/codecs.py -/usr/%{_lib}/python2.4/codecs.pyo -/usr/%{_lib}/python2.4/copy.py -/usr/%{_lib}/python2.4/copy.pyo -/usr/%{_lib}/python2.4/copy_reg.py -/usr/%{_lib}/python2.4/copy_reg.pyo -/usr/%{_lib}/python2.4/dis.py -/usr/%{_lib}/python2.4/dis.pyo -/usr/%{_lib}/python2.4/encodings/__init__.py -/usr/%{_lib}/python2.4/encodings/__init__.pyo -/usr/%{_lib}/python2.4/encodings/aliases.py -/usr/%{_lib}/python2.4/encodings/aliases.pyo -/usr/%{_lib}/python2.4/encodings/latin_1.py -/usr/%{_lib}/python2.4/encodings/latin_1.pyo -/usr/%{_lib}/python2.4/fnmatch.py -/usr/%{_lib}/python2.4/fnmatch.pyo -/usr/%{_lib}/python2.4/getopt.py -/usr/%{_lib}/python2.4/getopt.pyo -/usr/%{_lib}/python2.4/gettext.py -/usr/%{_lib}/python2.4/gettext.pyo -/usr/%{_lib}/python2.4/glob.py -/usr/%{_lib}/python2.4/glob.pyo -/usr/%{_lib}/python2.4/inspect.py -/usr/%{_lib}/python2.4/inspect.pyo -/usr/%{_lib}/python2.4/lib-dynload/_localemodule.so -/usr/%{_lib}/python2.4/lib-dynload/cPickle.so -/usr/%{_lib}/python2.4/lib-dynload/cStringIO.so -/usr/%{_lib}/python2.4/lib-dynload/grpmodule.so -/usr/%{_lib}/python2.4/lib-dynload/pwdmodule.so -/usr/%{_lib}/python2.4/lib-dynload/pyexpat.so -/usr/%{_lib}/python2.4/lib-dynload/stropmodule.so -/usr/%{_lib}/python2.4/lib-dynload/structmodule.so -/usr/%{_lib}/python2.4/lib-dynload/timemodule.so -/usr/%{_lib}/python2.4/lib-dynload/zlibmodule.so -/usr/%{_lib}/python2.4/linecache.py -/usr/%{_lib}/python2.4/linecache.pyo -/usr/%{_lib}/python2.4/locale.py -/usr/%{_lib}/python2.4/locale.pyo -/usr/%{_lib}/python2.4/opcode.py -/usr/%{_lib}/python2.4/opcode.pyo -/usr/%{_lib}/python2.4/os.py -/usr/%{_lib}/python2.4/os.pyo -/usr/%{_lib}/python2.4/posixpath.py -/usr/%{_lib}/python2.4/posixpath.pyo -/usr/%{_lib}/python2.4/re.py -/usr/%{_lib}/python2.4/re.pyo -/usr/%{_lib}/python2.4/site-packages/_xmlplus/__init__.py -/usr/%{_lib}/python2.4/site-packages/_xmlplus/__init__.pyo -/usr/%{_lib}/python2.4/site-packages/_xmlplus/utils/__init__.py -/usr/%{_lib}/python2.4/site-packages/_xmlplus/utils/__init__.pyo -/usr/%{_lib}/python2.4/site-packages/_xmlplus/utils/qp_xml.py -/usr/%{_lib}/python2.4/site-packages/_xmlplus/utils/qp_xml.pyo -/usr/%{_lib}/python2.4/site-packages/japanese.pth -/usr/%{_lib}/python2.4/site-packages/japanese/__init__.py -/usr/%{_lib}/python2.4/site-packages/japanese/__init__.pyo -/usr/%{_lib}/python2.4/site-packages/japanese/aliases/__init__.py -/usr/%{_lib}/python2.4/site-packages/japanese/aliases/__init__.pyo -/usr/%{_lib}/python2.4/site-packages/pyalchemist.so -/usr/%{_lib}/python2.4/site-packages/pyalchemist_python.py -/usr/%{_lib}/python2.4/site-packages/pyalchemist_python.pyo -/usr/%{_lib}/python2.4/site-packages/pygtk.pth -/usr/%{_lib}/python2.4/site-packages/rhpl/__init__.py -/usr/%{_lib}/python2.4/site-packages/rhpl/__init__.pyo -/usr/%{_lib}/python2.4/site-packages/rhpl/_translate.so -/usr/%{_lib}/python2.4/site-packages/rhpl/ethtool.so -/usr/%{_lib}/python2.4/site-packages/rhpl/gzread.py -/usr/%{_lib}/python2.4/site-packages/rhpl/gzread.pyo -/usr/%{_lib}/python2.4/site-packages/rhpl/iconv.so -/usr/%{_lib}/python2.4/site-packages/rhpl/translate.py -/usr/%{_lib}/python2.4/site-packages/rhpl/translate.pyo -/usr/%{_lib}/python2.4/site.py -/usr/%{_lib}/python2.4/site.pyo -/usr/%{_lib}/python2.4/sre.py -/usr/%{_lib}/python2.4/sre.pyo -/usr/%{_lib}/python2.4/sre_compile.py -/usr/%{_lib}/python2.4/sre_compile.pyo -/usr/%{_lib}/python2.4/sre_constants.py -/usr/%{_lib}/python2.4/sre_constants.pyo -/usr/%{_lib}/python2.4/sre_parse.py -/usr/%{_lib}/python2.4/sre_parse.pyo -/usr/%{_lib}/python2.4/stat.py -/usr/%{_lib}/python2.4/stat.pyo -/usr/%{_lib}/python2.4/string.py -/usr/%{_lib}/python2.4/string.pyo -/usr/%{_lib}/python2.4/token.py -/usr/%{_lib}/python2.4/token.pyo -/usr/%{_lib}/python2.4/tokenize.py -/usr/%{_lib}/python2.4/tokenize.pyo -/usr/%{_lib}/python2.4/types.py -/usr/%{_lib}/python2.4/types.pyo -/usr/%{_lib}/python2.4/warnings.py -/usr/%{_lib}/python2.4/warnings.pyo -/usr/%{_lib}/python2.4/xml/__init__.py -/usr/%{_lib}/python2.4/xml/__init__.pyo -/usr/%{_lib}/sasl2/Sendmail.conf -/usr/%{_lib}/sasl2/libanonymous.la -/usr/%{_lib}/sasl2/libanonymous.so.2 -/usr/%{_lib}/sasl2/liblogin.la -/usr/%{_lib}/sasl2/liblogin.so.2 -/usr/%{_lib}/sasl2/libplain.la -/usr/%{_lib}/sasl2/libplain.so.2 -/usr/%{_lib}/sasl2/libsasldb.la -/usr/%{_lib}/sasl2/libsasldb.so.2 -/usr/%{_lib}/vte/gnome-pty-helper -/usr/%{_lib}/xorg/modules/drivers/apm_drv.so -/usr/%{_lib}/xorg/modules/drivers/ark_drv.so -/usr/%{_lib}/xorg/modules/drivers/ati_drv.so -/usr/%{_lib}/xorg/modules/drivers/atimisc_drv.so -/usr/%{_lib}/xorg/modules/drivers/chips_drv.so /usr/%{_lib}/xorg/modules/drivers/cirrus_alpine.so /usr/%{_lib}/xorg/modules/drivers/cirrus_drv.so -/usr/%{_lib}/xorg/modules/drivers/cirrus_laguna.so -/usr/%{_lib}/xorg/modules/drivers/cyrix_drv.so -/usr/%{_lib}/xorg/modules/drivers/dummy_drv.so -/usr/%{_lib}/xorg/modules/drivers/fbdev_drv.so -/usr/%{_lib}/xorg/modules/drivers/glint_drv.so -/usr/%{_lib}/xorg/modules/drivers/i128_drv.so -/usr/%{_lib}/xorg/modules/drivers/i810_drv.so -/usr/%{_lib}/xorg/modules/drivers/mga_drv.so -/usr/%{_lib}/xorg/modules/drivers/neomagic_drv.so -/usr/%{_lib}/xorg/modules/drivers/nv_drv.so -/usr/%{_lib}/xorg/modules/drivers/r128_drv.so -/usr/%{_lib}/xorg/modules/drivers/radeon_drv.so -/usr/%{_lib}/xorg/modules/drivers/rendition_drv.so -/usr/%{_lib}/xorg/modules/drivers/riva128.so -/usr/%{_lib}/xorg/modules/drivers/s3_drv.so -/usr/%{_lib}/xorg/modules/drivers/s3virge_drv.so -/usr/%{_lib}/xorg/modules/drivers/savage_drv.so -/usr/%{_lib}/xorg/modules/drivers/siliconmotion_drv.so -/usr/%{_lib}/xorg/modules/drivers/sis_drv.so -/usr/%{_lib}/xorg/modules/drivers/tdfx_drv.so -/usr/%{_lib}/xorg/modules/drivers/tga_drv.so -/usr/%{_lib}/xorg/modules/drivers/trident_drv.so -/usr/%{_lib}/xorg/modules/drivers/tseng_drv.so -/usr/%{_lib}/xorg/modules/drivers/v4l_drv.so -/usr/%{_lib}/xorg/modules/drivers/vesa_drv.so -/usr/%{_lib}/xorg/modules/drivers/vga_drv.so -/usr/%{_lib}/xorg/modules/drivers/vmware_drv.so /usr/%{_lib}/xorg/modules/extensions/libGLcore.so /usr/%{_lib}/xorg/modules/extensions/libdbe.so /usr/%{_lib}/xorg/modules/extensions/libdri.so /usr/%{_lib}/xorg/modules/extensions/libextmod.so /usr/%{_lib}/xorg/modules/extensions/libglx.so /usr/%{_lib}/xorg/modules/extensions/librecord.so -/usr/%{_lib}/xorg/modules/extensions/libvnc.so -/usr/%{_lib}/xorg/modules/extensions/libxtrap.so /usr/%{_lib}/xorg/modules/fonts/libbitmap.so /usr/%{_lib}/xorg/modules/fonts/libfreetype.so /usr/%{_lib}/xorg/modules/fonts/libtype1.so -/usr/%{_lib}/xorg/modules/input/acecad_drv.so -/usr/%{_lib}/xorg/modules/input/aiptek_drv.so -/usr/%{_lib}/xorg/modules/input/calcomp_drv.so -/usr/%{_lib}/xorg/modules/input/citron_drv.so -/usr/%{_lib}/xorg/modules/input/digitaledge_drv.so -/usr/%{_lib}/xorg/modules/input/dmc_drv.so -/usr/%{_lib}/xorg/modules/input/dynapro_drv.so -/usr/%{_lib}/xorg/modules/input/elographics_drv.so -/usr/%{_lib}/xorg/modules/input/fpit_drv.so -/usr/%{_lib}/xorg/modules/input/hyperpen_drv.so -/usr/%{_lib}/xorg/modules/input/js_x_drv.so /usr/%{_lib}/xorg/modules/input/kbd_drv.so -/usr/%{_lib}/xorg/modules/input/keyboard_drv.so -/usr/%{_lib}/xorg/modules/input/magellan_drv.so -/usr/%{_lib}/xorg/modules/input/microtouch_drv.so /usr/%{_lib}/xorg/modules/input/mouse_drv.so -/usr/%{_lib}/xorg/modules/input/mutouch_drv.so -/usr/%{_lib}/xorg/modules/input/palmax_drv.so -/usr/%{_lib}/xorg/modules/input/penmount_drv.so -/usr/%{_lib}/xorg/modules/input/spaceorb_drv.so -/usr/%{_lib}/xorg/modules/input/summa_drv.so -/usr/%{_lib}/xorg/modules/input/synaptics_drv.so -/usr/%{_lib}/xorg/modules/input/tek4957_drv.so -/usr/%{_lib}/xorg/modules/input/ur98_drv.so -/usr/%{_lib}/xorg/modules/input/void_drv.so -/usr/%{_lib}/xorg/modules/input/wacom_drv.so -/usr/%{_lib}/xorg/modules/libafb.so -/usr/%{_lib}/xorg/modules/libcfb.so -/usr/%{_lib}/xorg/modules/libcfb16.so -/usr/%{_lib}/xorg/modules/libcfb24.so -/usr/%{_lib}/xorg/modules/libcfb32.so -/usr/%{_lib}/xorg/modules/libcw.so -/usr/%{_lib}/xorg/modules/libdamage.so /usr/%{_lib}/xorg/modules/libddc.so /usr/%{_lib}/xorg/modules/libfb.so /usr/%{_lib}/xorg/modules/libi2c.so /usr/%{_lib}/xorg/modules/libint10.so -/usr/%{_lib}/xorg/modules/liblayer.so -/usr/%{_lib}/xorg/modules/libmfb.so /usr/%{_lib}/xorg/modules/libpcidata.so -/usr/%{_lib}/xorg/modules/librac.so -/usr/%{_lib}/xorg/modules/libramdac.so -/usr/%{_lib}/xorg/modules/libscanpci.so -/usr/%{_lib}/xorg/modules/libshadow.so -/usr/%{_lib}/xorg/modules/libvbe.so /usr/%{_lib}/xorg/modules/libvgahw.so /usr/%{_lib}/xorg/modules/libxaa.so -/usr/%{_lib}/xorg/modules/libxf24_32bpp.so -/usr/%{_lib}/xorg/modules/libxf4bpp.so -/usr/%{_lib}/xorg/modules/libxf8_16bpp.so -/usr/%{_lib}/xorg/modules/libxf8_32bpp.so /usr/%{_lib}/xorg/modules/linux/libdrm.so -/usr/%{_lib}/xorg/modules/linux/libfbdevhw.so -/usr/%{_lib}/xorg/modules/v20002d.uc /usr/%{_lib}/xserver/SecurityPolicy -/usr/bin/X -/usr/bin/cpp -/usr/bin/dircolors -/usr/bin/fc-cache -/usr/bin/find -/usr/bin/gnome-session -/usr/bin/id -/usr/bin/lesspipe.sh -/usr/bin/logger -/usr/bin/make -/usr/bin/newaliases -/usr/bin/nifd -/usr/bin/rfcomm -/usr/bin/rhgb -/usr/bin/rhgb-client -/usr/bin/setxkbmap -/usr/bin/tee -/usr/bin/udevinfo -/usr/bin/uniq -/usr/bin/xfs -/usr/bin/xrdb -/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.1/cc1 -/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.1/collect2 -/usr/libexec/gdmchooser -/usr/libexec/gdmgreeter -/usr/libexec/gdmlogin -/usr/libexec/hald-addon-acpi -/usr/libexec/hald-addon-storage -/usr/libexec/hald-probe-input -/usr/libexec/hald-probe-pc-floppy -/usr/libexec/hald-probe-smbios -/usr/libexec/hald-probe-storage -/usr/libexec/hald-probe-volume -/usr/sbin/acpid -/usr/sbin/anacron -/usr/sbin/atd -/usr/sbin/automount -/usr/sbin/chkfontpath -/usr/sbin/cpuspeed -/usr/sbin/crond -/usr/sbin/cupsd -/usr/sbin/gdm -/usr/sbin/gdm-binary -/usr/sbin/gdmsetup -/usr/sbin/gpm -/usr/sbin/hald -/usr/sbin/hcid -/usr/sbin/hid2hci -/usr/sbin/kudzu -/usr/sbin/rhnsd -/usr/sbin/rpc.gssd -/usr/sbin/rpc.idmapd -/usr/sbin/sdpd -/usr/sbin/sendmail -/usr/sbin/sshd -/usr/sbin/system-config-network-cmd +/usr/share/X11/XKeysymDB +/usr/share/X11/fonts/Type1/cour.pfa +/usr/share/X11/fonts/Type1/l047013t.pfa /usr/share/X11/fonts/misc/6x13-ISO8859-1.pcf.gz /usr/share/X11/fonts/misc/cursor.pcf.gz /usr/share/X11/fonts/misc/fonts.alias /usr/share/X11/fonts/misc/fonts.dir +/usr/share/X11/locale/C/XLC_LOCALE +/usr/share/X11/locale/en_US.UTF-8/XLC_LOCALE /usr/share/X11/locale/locale.alias -/usr/share/cups/banners/classified -/usr/share/cups/banners/confidential -/usr/share/cups/banners/secret -/usr/share/cups/banners/standard -/usr/share/cups/banners/topsecret -/usr/share/cups/banners/unclassified -/usr/share/cups/model/deskjet.ppd.gz -/usr/share/cups/model/deskjet2.ppd.gz -/usr/share/cups/model/dymo.ppd.gz -/usr/share/cups/model/epson24.ppd.gz -/usr/share/cups/model/epson9.ppd.gz -/usr/share/cups/model/laserjet.ppd.gz -/usr/share/cups/model/okidat24.ppd.gz -/usr/share/cups/model/okidata9.ppd.gz -/usr/share/cups/model/postscript.ppd.gz -/usr/share/cups/model/stcolor.ppd.gz -/usr/share/cups/model/stcolor2.ppd.gz -/usr/share/cups/model/stphoto.ppd.gz -/usr/share/cups/model/stphoto2.ppd.gz -/usr/share/cups/model/textonly.ppd -/usr/share/cups/model/zebra.ppd.gz +/usr/share/X11/locale/locale.dir +/usr/share/X11/xkb/compat/accessx +/usr/share/X11/xkb/compat/basic +/usr/share/X11/xkb/compat/complete +/usr/share/X11/xkb/compat/iso9995 +/usr/share/X11/xkb/compat/ledcaps +/usr/share/X11/xkb/compat/lednum +/usr/share/X11/xkb/compat/ledscroll +/usr/share/X11/xkb/compat/level5 +/usr/share/X11/xkb/compat/misc +/usr/share/X11/xkb/compat/mousekeys +/usr/share/X11/xkb/compat/xfree86 +/usr/share/X11/xkb/geometry/pc +/usr/share/X11/xkb/keycodes/aliases +/usr/share/X11/xkb/keycodes/xfree86 +/usr/share/X11/xkb/rules/base +/usr/share/X11/xkb/symbols/pc +/usr/share/X11/xkb/symbols/us +/usr/share/X11/xkb/types/basic +/usr/share/X11/xkb/types/complete +/usr/share/X11/xkb/types/extra +/usr/share/X11/xkb/types/iso9995 +/usr/share/X11/xkb/types/level5 +/usr/share/X11/xkb/types/mousekeys +/usr/share/X11/xkb/types/pc /usr/share/fonts/bitmap-fonts/10x20.pcf -/usr/share/fonts/bitmap-fonts/5x8.pcf -/usr/share/fonts/bitmap-fonts/6x10.pcf -/usr/share/fonts/bitmap-fonts/6x12.pcf /usr/share/fonts/bitmap-fonts/6x13.pcf -/usr/share/fonts/bitmap-fonts/6x9.pcf /usr/share/fonts/bitmap-fonts/9x15.pcf /usr/share/fonts/bitmap-fonts/9x18.pcf /usr/share/fonts/bitmap-fonts/console8x16.pcf -/usr/share/fonts/bitmap-fonts/console8x8.pcf -/usr/share/fonts/bitmap-fonts/fonts.cache-1 -/usr/share/fonts/bitmap-fonts/lutRS10.pcf -/usr/share/fonts/bitmap-fonts/lutRS12.pcf -/usr/share/fonts/bitstream-vera/Vera.ttf -/usr/share/fonts/bitstream-vera/VeraBI.ttf -/usr/share/fonts/bitstream-vera/VeraBd.ttf /usr/share/fonts/bitstream-vera/VeraMono.ttf -/usr/share/fonts/bitstream-vera/fonts.cache-1 -/usr/share/fonts/default/Type1/c059013l.pfb -/usr/share/fonts/default/Type1/fonts.cache-1 -/usr/share/fonts/default/Type1/fonts.dir -/usr/share/fonts/default/Type1/n019003l.pfb /usr/share/fonts/default/Type1/n022003l.pfb /usr/share/fonts/default/Type1/s050000l.pfb -/usr/share/fonts/default/fonts.cache-1 -/usr/share/fonts/default/ghostscript/fonts.cache-1 -/usr/share/fonts/fonts.cache-1 -/usr/share/gdm/BuiltInSessions/default.desktop -/usr/share/gdm/themes/Bluecurve/Bluecurve.xml -/usr/share/gdm/themes/Bluecurve/screenshot.png -/usr/share/gdm/themes/Bluecurve/icon-session.png -/usr/share/gdm/themes/Bluecurve/icon-reboot.png -/usr/share/gdm/themes/Bluecurve/icon-language.png -/usr/share/gdm/themes/Bluecurve/redhat_logo.png -/usr/share/gdm/themes/Bluecurve/icon-shutdown.png -/usr/share/gdm/themes/Bluecurve/background.png -/usr/share/gdm/themes/Bluecurve/distribution.png -/usr/share/gdm/themes/Bluecurve/GdmGreeterTheme.desktop -/usr/share/gdm/themes/Bluecurve/rh_logo-header.png -/usr/share/gdm/themes/Bluecurve/logo.png -/usr/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi -/usr/share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi -/usr/share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi -/usr/share/hal/fdi/information/10freedesktop/10-usb-pda.fdi -/usr/share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi -/usr/share/hal/fdi/information/10freedesktop/10-wireless-mice.fdi -/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi -/usr/share/hal/fdi/policy/10osvendor/20-storage-methods.fdi -/usr/share/hal/fdi/policy/10osvendor/15-storage-luks.fdi -/usr/share/hal/fdi/policy/10osvendor/10-keyboard-policy.fdi -/usr/share/hal/fdi/policy/10osvendor/10-toshiba-buttons.fdi -/usr/share/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi -/usr/share/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi -/usr/share/hal/fdi/policy/10osvendor/99-redhat-storage-policy-fixed-drives.fdi -/usr/share/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi -/usr/share/hwdata/pci.ids -/usr/share/hwdata/usb.ids +/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf +/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-ExtraLight.ttf +/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf +/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf +/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf +/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf +/usr/share/hwdata/videoaliases/ati.xinf +/usr/share/hwdata/videoaliases/i810.xinf +/usr/share/hwdata/videoaliases/savage.xinf /usr/share/icons/Bluecurve/cursors/left_ptr -/usr/share/icons/Bluecurve/cursors/watch +/usr/share/icons/Bluecurve/cursors/left_ptr_watch /usr/share/icons/Bluecurve/cursors/xterm /usr/share/icons/Bluecurve/index.theme /usr/share/icons/default/index.theme /usr/share/icons/gnome/index.theme /usr/share/locale/locale.alias -/usr/share/rhgb/large-computer.png +/usr/share/rhgb/main-logo.png /usr/share/rhgb/system-logo.png /usr/share/rhgb/throbber-anim.png /usr/share/themes/Clearlooks/gtk-2.0/gtkrc -/usr/share/themes/Clearlooks/index.theme /usr/share/vte/termcap/xterm -/usr/share/xsessions/gnome.desktop /usr/share/zoneinfo/Universal +/var/lib/random-seed View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 default.later.in Index: default.later.in =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-6/default.later.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- default.later.in 2 Feb 2007 00:05:11 -0000 1.4 +++ default.later.in 1 Mar 2007 09:48:58 -0000 1.5 @@ -1,16 +1,115 @@ -/%{_lib}/libgcc_s.so.1 +/bin/basename +/bin/bash +/bin/cat +/bin/chgrp +/bin/chmod +/bin/chown +/bin/cut +/bin/date +/bin/dbus-daemon +/bin/dd /bin/df +/bin/dmesg +/bin/gawk +/bin/grep +/bin/gzip +/bin/hostname +/bin/ipcalc +/bin/loadkeys +/bin/login +/bin/ls +/bin/mkdir +/bin/mktemp +/bin/mount /bin/netstat +/bin/nice +/bin/rm +/bin/sed +/bin/sleep +/bin/sort +/bin/touch +/bin/true +/bin/umount +/bin/uname +/bin/unicode_start +/boot/grub/grub.conf +/etc/DIR_COLORS +/etc/DIR_COLORS.xterm /etc/X11/Xmodmap -/etc/X11/gdm/PreSession/Default +/etc/X11/Xresources +/etc/X11/fs/config +/etc/X11/prefdm /etc/X11/xinit/Xclients /etc/X11/xinit/Xsession /etc/X11/xinit/xinitrc-common +/etc/X11/xinit/xinitrc.d/localuser.sh /etc/X11/xinit/xinitrc.d/xinput.sh -/etc/alsa/ainit.conf +/etc/X11/xinit/xinput.d/none.conf +/etc/X11/xorg.conf +/etc/acpi/events/power.conf +/etc/acpi/events/video.conf +/etc/aliases +/etc/aliases.db +/etc/alsa/alsa.conf +/etc/anacrontab +/etc/auto.master +/etc/avahi/avahi-daemon.conf +/etc/avahi/etc/localtime +/etc/bashrc +/etc/beagle/external-filters.xml +/etc/blkid/blkid.tab +/etc/bluetooth/hcid.conf +/etc/bluetooth/rfcomm.conf /etc/bonobo-activation/bonobo-activation-config.xml +/etc/cpuspeed.conf +/etc/cron.d/sa-update +/etc/cron.hourly/mcelog.cron +/etc/crontab +/etc/cups/classes.conf /etc/cups/client.conf +/etc/cups/cupsd.conf +/etc/cups/lpoptions +/etc/cups/mime.convs +/etc/cups/mime.types +/etc/cups/printers.conf +/etc/cups/pstoraster.convs /etc/dbus-1/session.conf +/etc/dbus-1/system.conf +/etc/dbus-1/system.d/NetworkManager.conf +/etc/dbus-1/system.d/avahi-dbus.conf +/etc/dbus-1/system.d/bluez-hcid.conf +/etc/dbus-1/system.d/cups.conf +/etc/dbus-1/system.d/dhcdbd.conf +/etc/dbus-1/system.d/gnome-power-manager.conf +/etc/dbus-1/system.d/hal.conf +/etc/dbus-1/system.d/nm-applet.conf +/etc/dbus-1/system.d/printdriverselector.conf +/etc/dbus-1/system.d/yum-updatesd.conf +/etc/environment +/etc/fedora-release +/etc/fonts/conf.avail/20-fix-globaladvance.conf +/etc/fonts/conf.avail/20-lohit-gujarati.conf +/etc/fonts/conf.avail/20-unhint-small-vera.conf +/etc/fonts/conf.avail/30-amt-aliases.conf +/etc/fonts/conf.avail/30-urw-aliases.conf +/etc/fonts/conf.avail/40-generic.conf +/etc/fonts/conf.avail/49-sansserif.conf +/etc/fonts/conf.avail/50-user.conf +/etc/fonts/conf.avail/51-local.conf +/etc/fonts/conf.avail/60-latin.conf +/etc/fonts/conf.avail/65-fonts-persian.conf +/etc/fonts/conf.avail/65-nonlatin.conf +/etc/fonts/conf.avail/69-unifont.conf +/etc/fonts/conf.avail/80-delicious.conf +/etc/fonts/conf.avail/90-synthetic.conf +/etc/fonts/conf.d/25-no-hint-fedora.conf +/etc/fonts/conf.d/30-aliases-fedora.conf +/etc/fonts/conf.d/40-generic-fedora.conf +/etc/fonts/conf.d/59-dejavu-lgc-fonts.conf +/etc/fonts/conf.d/64-nonlatin-fedora.conf +/etc/fonts/conf.d/75-blacklist-fedora.conf +/etc/fonts/fonts.conf +/etc/fstab /etc/gconf/2/evoldap.conf /etc/gconf/2/path /etc/gconf/gconf.xml.defaults/%gconf-tree-af.xml @@ -132,7 +231,6 @@ /etc/gconf/schemas/apps_nautilus_preferences.schemas /etc/gconf/schemas/baobab.schemas /etc/gconf/schemas/battstat.schemas -/etc/gconf/schemas/brlmonitor.schemas /etc/gconf/schemas/cdda-url-handler.schemas /etc/gconf/schemas/charpick.schemas /etc/gconf/schemas/clock.schemas @@ -187,7 +285,6 @@ /etc/gconf/schemas/gnome-terminal.schemas /etc/gconf/schemas/gnome-volume-control.schemas /etc/gconf/schemas/gnome-volume-manager.schemas -/etc/gconf/schemas/gnopernicus.schemas /etc/gconf/schemas/gok.schemas /etc/gconf/schemas/gsf-office-thumbnailer.schemas /etc/gconf/schemas/gstreamer-0.10.schemas @@ -212,7 +309,6 @@ /etc/gconf/schemas/panel-object.schemas /etc/gconf/schemas/panel-toplevel.schemas /etc/gconf/schemas/pilot.schemas -/etc/gconf/schemas/remote.schemas /etc/gconf/schemas/stickynotes.schemas /etc/gconf/schemas/system_dns_sd.schemas /etc/gconf/schemas/system_http_proxy.schemas @@ -224,33 +320,582 @@ /etc/gconf/schemas/window-list.schemas /etc/gconf/schemas/workspace-switcher.schemas /etc/gconf/schemas/yelp.schemas +/etc/gdm/Init/Default +/etc/gdm/PreSession/Default +/etc/gdm/custom.conf +/etc/gdm/locale.alias +/etc/gdm/securitytokens.conf /etc/gnome-vfs-2.0/modules/default-modules.conf /etc/gnome-vfs-2.0/modules/font-method.conf /etc/gnome-vfs-2.0/modules/mapping-modules.conf /etc/gnome-vfs-2.0/modules/smb-module.conf /etc/gnome-vfs-2.0/modules/ssl-modules.conf /etc/gnome-vfs-2.0/modules/theme-method.conf -/etc/pam.d/xscreensaver -/etc/rc.d/init.d/pcmcia +/etc/group +/etc/gtk-2.0/gtkrc +/etc/host.conf +/etc/hosts +/etc/hosts.allow +/etc/hosts.deny +/etc/hp/hplip.conf +/etc/idmapd.conf +/etc/inittab +/etc/inputrc +/etc/iproute2/rt_scopes +/etc/issue +/etc/krb5.conf +/etc/ld.so.cache +/etc/localtime +/etc/lvm/.cache +/etc/lvm/lvm.conf +/etc/mail/Makefile +/etc/mail/local-host-names +/etc/mail/sendmail.cf +/etc/mail/submit.cf +/etc/mail/trusted-users +/etc/makedev.d/00macros +/etc/makedev.d/01alsa +/etc/makedev.d/01cciss +/etc/makedev.d/01cdrom +/etc/makedev.d/01console +/etc/makedev.d/01dac960 +/etc/makedev.d/01ftape +/etc/makedev.d/01generic +/etc/makedev.d/01ia64 +/etc/makedev.d/01ibcs [...2182 lines suppressed...] +/usr/share/hplip/base/pml.py +/usr/share/hplip/base/pml.pyc +/usr/share/hplip/base/service.py +/usr/share/hplip/base/service.pyc +/usr/share/hplip/base/slp.py +/usr/share/hplip/base/slp.pyc +/usr/share/hplip/base/status.py +/usr/share/hplip/base/status.pyc +/usr/share/hplip/base/strings.py +/usr/share/hplip/base/strings.pyc +/usr/share/hplip/base/utils.py +/usr/share/hplip/base/utils.pyc +/usr/share/hplip/hpssd.py +/usr/share/hplip/prnt/__init__.py +/usr/share/hplip/prnt/__init__.pyc +/usr/share/hplip/prnt/cups.py +/usr/share/hplip/prnt/cups.pyc +/usr/share/hplip/prnt/ldl.py +/usr/share/hplip/prnt/ldl.pyc +/usr/share/hplip/prnt/pcl.py +/usr/share/hplip/prnt/pcl.pyc +/usr/share/hwdata/pci.ids +/usr/share/hwdata/usb.ids +/usr/share/hwdata/videoaliases/ast.xinf +/usr/share/hwdata/videoaliases/ati.xinf +/usr/share/hwdata/videoaliases/cirrus.xinf +/usr/share/hwdata/videoaliases/i810.xinf +/usr/share/hwdata/videoaliases/mga.xinf +/usr/share/hwdata/videoaliases/nv.xinf +/usr/share/hwdata/videoaliases/r128.xinf +/usr/share/hwdata/videoaliases/radeon.xinf +/usr/share/hwdata/videoaliases/s3.xinf +/usr/share/hwdata/videoaliases/s3virge.xinf +/usr/share/hwdata/videoaliases/savage.xinf +/usr/share/hwdata/videoaliases/siliconmotion.xinf +/usr/share/hwdata/videoaliases/sis.xinf +/usr/share/hwdata/videoaliases/tdfx.xinf +/usr/share/hwdata/videoaliases/trident.xinf +/usr/share/hwdata/videoaliases/vga.xinf +/usr/share/hwdata/videoaliases/via.xinf +/usr/share/hwdata/videoaliases/vmware.xinf +/usr/share/hwdata/videoaliases/voodoo.xinf /usr/share/icons/Bluecurve/16x16/apps/icon-accessibility-technologies.png /usr/share/icons/Bluecurve/16x16/apps/icon-accessibility.png /usr/share/icons/Bluecurve/16x16/apps/icon-accessories.png @@ -3704,13 +5213,42 @@ /usr/share/icons/Bluecurve/index.theme /usr/share/icons/Clearlooks/icon-theme.cache /usr/share/icons/Clearlooks/index.theme +/usr/share/icons/default/index.theme +/usr/share/icons/gnome/16x16/mimetypes/text-x-preview.png +/usr/share/icons/gnome/24x24/apps/text-editor.png +/usr/share/icons/gnome/24x24/mimetypes/x-office-calendar.png +/usr/share/icons/gnome/24x24/stock/document/stock_task.png +/usr/share/icons/gnome/24x24/stock/net/stock_contact.png /usr/share/icons/gnome/icon-theme.cache +/usr/share/icons/gnome/index.theme +/usr/share/icons/hicolor/22x22/apps/totem.png +/usr/share/icons/hicolor/24x24/apps/vnc.png +/usr/share/icons/hicolor/48x48/apps/baobab.png +/usr/share/icons/hicolor/48x48/apps/gnome-aisleriot.png +/usr/share/icons/hicolor/48x48/apps/gnome-blackjack.png +/usr/share/icons/hicolor/48x48/apps/gnome-five-or-more.png +/usr/share/icons/hicolor/48x48/apps/gnome-four-in-a-row.png +/usr/share/icons/hicolor/48x48/apps/gnome-freecell.png +/usr/share/icons/hicolor/48x48/apps/gnome-klotski.png +/usr/share/icons/hicolor/48x48/apps/gnome-mahjongg.png +/usr/share/icons/hicolor/48x48/apps/gnome-same-gnome.png +/usr/share/icons/hicolor/48x48/apps/gnome-tetravex.png +/usr/share/icons/hicolor/48x48/apps/gthumb.png /usr/share/icons/hicolor/icon-theme.cache /usr/share/icons/hicolor/index.theme -/usr/share/locale/en_US/cups_en_US +/usr/share/icons/hicolor/scalable/apps/gnome-ataxx.svg +/usr/share/icons/hicolor/scalable/apps/gnome-dictionary.svg +/usr/share/icons/hicolor/scalable/apps/gnome-gnomine.svg +/usr/share/icons/hicolor/scalable/apps/gnome-iagno.svg +/usr/share/icons/hicolor/scalable/apps/gnome-nibbles.svg +/usr/share/icons/hicolor/scalable/apps/gnome-robots.svg +/usr/share/icons/hicolor/scalable/apps/gnome-tali.svg +/usr/share/locale/en_US/LC_MESSAGES/redhat-dist.mo +/usr/share/locale/locale.alias /usr/share/man/man1/firefox.1.gz /usr/share/mime/aliases /usr/share/mime/application/octet-stream.xml +/usr/share/mime/application/x-nautilus-link.xml /usr/share/mime/globs /usr/share/mime/magic /usr/share/mime/subclasses @@ -3719,19 +5257,103 @@ /usr/share/nautilus/ui/nautilus-icon-view-ui.xml /usr/share/nautilus/ui/nautilus-shell-ui.xml /usr/share/nautilus/ui/nautilus-spatial-window-ui.xml -/usr/share/pixmaps/applet-busy.png -/usr/share/pixmaps/applet-critical-blank.png -/usr/share/pixmaps/applet-critical.png -/usr/share/pixmaps/applet-disconnect.png -/usr/share/pixmaps/applet-error.png -/usr/share/pixmaps/applet-okay.png +/usr/share/nm-applet/applet.glade +/usr/share/pirut/pixmaps/puplet-available.png +/usr/share/pirut/pixmaps/puplet-downloading.png +/usr/share/pirut/pixmaps/puplet-error.png +/usr/share/pirut/pixmaps/puplet-updated.png +/usr/share/pirut/ui/puplet.glade /usr/share/pixmaps/badge-small.png +/usr/share/pixmaps/blueradio-48.png +/usr/share/pixmaps/ekiga.png /usr/share/pixmaps/firefox.png +/usr/share/pixmaps/gnome-planner.png +/usr/share/pixmaps/gnome-terminal.png /usr/share/pixmaps/keyring.png /usr/share/pixmaps/nautilus/text-selection-frame.png /usr/share/pixmaps/nautilus/thumbnail_frame.png +/usr/share/pixmaps/password.png +/usr/share/pixmaps/pirut.png +/usr/share/pixmaps/pup.png /usr/share/pixmaps/splash/gnome-splash.png +/usr/share/rhgb/large-computer.png +/usr/share/rhgb/main-logo.png +/usr/share/rhgb/system-logo.png +/usr/share/rhgb/throbber-anim.png +/usr/share/sane/xsane/xsane-logo.xpm +/usr/share/system-config-network/netconf-cmd.py +/usr/share/themes/Clearlooks/gtk-2.0/gtkrc +/usr/share/themes/Clearlooks/index.theme /usr/share/themes/Clearlooks/metacity-1/metacity-theme-1.xml /usr/share/themes/Default/gtk-2.0-key/gtkrc -/usr/share/themes/Raleigh/gtk/gtkrc +/usr/share/vim/vim70/filetype.vim +/usr/share/vim/vim70/plugin/README.txt +/usr/share/vim/vim70/plugin/getscript.vim +/usr/share/vim/vim70/plugin/gzip.vim +/usr/share/vim/vim70/plugin/matchparen.vim +/usr/share/vim/vim70/plugin/netrwPlugin.vim +/usr/share/vim/vim70/plugin/rrhelper.vim +/usr/share/vim/vim70/plugin/spellfile.vim +/usr/share/vim/vim70/plugin/tarPlugin.vim +/usr/share/vim/vim70/plugin/tohtml.vim +/usr/share/vim/vim70/plugin/vimballPlugin.vim +/usr/share/vim/vim70/plugin/zipPlugin.vim +/usr/share/vim/vim70/syntax/grub.vim +/usr/share/vim/vim70/syntax/syncolor.vim +/usr/share/vim/vim70/syntax/synload.vim +/usr/share/vim/vim70/syntax/syntax.vim +/usr/share/vte/termcap/xterm +/usr/share/xsessions/gnome.desktop +/usr/share/yum-cli/callback.py +/usr/share/yum-cli/callback.pyc +/usr/share/yum-cli/cli.py +/usr/share/yum-cli/cli.pyc +/usr/share/yum-cli/i18n.py +/usr/share/yum-cli/i18n.pyc +/usr/share/yum-cli/output.py +/usr/share/yum-cli/output.pyc +/usr/share/yum-cli/shell.py +/usr/share/yum-cli/shell.pyc +/usr/share/yum-cli/yumcommands.py +/usr/share/yum-cli/yumcommands.pyc +/usr/share/yum-cli/yummain.py +/usr/share/yum-cli/yummain.pyc +/usr/share/yum-cli/yumupd.py +/usr/share/yum-cli/yumupd.pyc +/usr/share/zoneinfo/GMT /usr/share/zoneinfo/UTC +/usr/share/zoneinfo/Universal +/var/cache/beagle/indexes/applications/fingerprint +/var/cache/beagle/indexes/applications/version +/var/cache/beagle/indexes/documentation/fingerprint +/var/cache/beagle/indexes/documentation/version +/var/cache/cups/job.cache +/var/cache/cups/remote.cache +/var/cache/yum/core/cachecookie +/var/cache/yum/core/primary.xml.gz +/var/cache/yum/core/primary.xml.gz.sqlite +/var/cache/yum/core/repomd.xml +/var/cache/yum/extras/cachecookie +/var/cache/yum/extras/primary.xml.gz +/var/cache/yum/extras/primary.xml.gz.sqlite +/var/cache/yum/extras/repomd.xml +/var/cache/yum/updates/cachecookie +/var/cache/yum/updates/primary.xml.gz +/var/cache/yum/updates/primary.xml.gz.sqlite +/var/cache/yum/updates/repomd.xml +/var/cache/yum/updates/updateinfo.xml.gz +/var/empty/sshd/etc/localtime +/var/lib/dbus/.rh-config-is-upgraded +/var/lib/dbus/machine-id +/var/lib/dhclient/dhclient-eth0.leases +/var/lib/nfs/statd/state +/var/lib/random-seed +/var/lib/rpm/Name +/var/lib/rpm/Packages +/var/lib/rpm/Providename +/var/lib/rpm/__db.001 +/var/lib/rpm/__db.002 +/var/lib/rpm/__db.003 +/var/spool/anacron/cron.daily +/var/spool/anacron/cron.monthly +/var/spool/anacron/cron.weekly Index: readahead.spec =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-6/readahead.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- readahead.spec 2 Feb 2007 00:05:11 -0000 1.35 +++ readahead.spec 1 Mar 2007 09:48:58 -0000 1.36 @@ -1,7 +1,7 @@ Summary: Read a preset list of files into memory. Name: readahead Version: 1.3 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Group: System Environment/Base License: GPL/OSL @@ -66,6 +66,9 @@ %changelog +* Thu Mar 1 2007 Karel Zak - 1:1.3-7 +- new lists (generated by readahead-1.4) + * Fri Feb 2 2007 Karel Zak - 1:1.3-6 - update file lists Index: sources =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2007 00:05:11 -0000 1.3 +++ sources 1 Mar 2007 09:48:58 -0000 1.4 @@ -1 +1,3 @@ 268fe48994c0fc4672c8c0255099d74b readahead-1.3.tar.gz +f95946b1b5373ef6255dd1b3773217ba default.early.in +bca200a779fe5dd6aa134459c6ab0c16 default.later.in From fedora-cvs-commits at redhat.com Thu Mar 1 10:01:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 05:01:38 -0500 Subject: rpms/hplip/devel .cvsignore, 1.16, 1.17 hplip.spec, 1.105, 1.106 sources, 1.16, 1.17 hplip-1.7.1-1.patch, 1.1, NONE hplip-hpfax.patch, 1.1, NONE Message-ID: <200703011001.l21A1ckh026906@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26890 Modified Files: .cvsignore hplip.spec sources Removed Files: hplip-1.7.1-1.patch hplip-hpfax.patch Log Message: * Wed Mar 1 2007 Tim Waugh 1.7.2-1 - 1.7.2. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 14 Feb 2007 17:39:22 -0000 1.16 +++ .cvsignore 1 Mar 2007 10:01:30 -0000 1.17 @@ -13,3 +13,4 @@ hplip-1.6.10.tar.gz hplip-1.6.12.tar.gz hplip-1.7.1.tar.gz +hplip-1.7.2.tar.gz Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- hplip.spec 14 Feb 2007 17:39:22 -0000 1.105 +++ hplip.spec 1 Mar 2007 10:01:30 -0000 1.106 @@ -1,6 +1,6 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 1.7.1 +Version: 1.7.2 Release: 1%{?dist} License: GPL/MIT/BSD Group: System Environment/Daemons @@ -13,14 +13,12 @@ Url: http://hplip.sourceforge.net/ Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz -Patch0: hplip-1.7.1-1.patch Patch1: hplip-desktop.patch Patch2: hplip-guest.patch Patch3: hplip-quiet.patch Patch4: hplip-cups-backend.patch Patch5: hplip-libm.patch Patch6: hplip-ipv6.patch -Patch7: hplip-hpfax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -68,8 +66,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup -q -%patch0 -p1 -b .1.7.1-1 - # Use /usr/share/applications for putting desktop files in. %patch1 -p1 -b .desktop @@ -85,9 +81,6 @@ # IPv6 support (bug #198377). %patch6 -p1 -b .ipv6 -# Fix hpfax backend device query. -%patch7 -p1 -b .hpfax - autoconf # for patch4 %build @@ -188,6 +181,9 @@ exit 0 %changelog +* Wed Mar 1 2007 Tim Waugh 1.7.2-1 +- 1.7.2. + * Wed Feb 14 2007 Tim Waugh 1.7.1-1 - 1.7.1. Index: sources =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Feb 2007 17:39:22 -0000 1.16 +++ sources 1 Mar 2007 10:01:30 -0000 1.17 @@ -1 +1 @@ -1732a8544413ba8557c8b71929d848fa hplip-1.7.1.tar.gz +739a9cef41ca655ad98bc35a39c0517e hplip-1.7.2.tar.gz --- hplip-1.7.1-1.patch DELETED --- --- hplip-hpfax.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 1 11:11:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 06:11:40 -0500 Subject: rpms/logrotate/devel .cvsignore, 1.16, 1.17 logrotate.spec, 1.58, 1.59 sources, 1.21, 1.22 logrotate-errorConfiguration.patch, 1.2, NONE logrotate-fdLeak.patch, 1.1, NONE logrotate-selinux.patch, 1.1, NONE logrotate-sizeOption.patch, 1.1, NONE logrotate-widecharPath.patch, 1.1, NONE Message-ID: <200703011111.l21BBeto024081@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/logrotate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23965 Modified Files: .cvsignore logrotate.spec sources Removed Files: logrotate-errorConfiguration.patch logrotate-fdLeak.patch logrotate-selinux.patch logrotate-sizeOption.patch logrotate-widecharPath.patch Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 17 May 2006 15:07:54 -0000 1.16 +++ .cvsignore 1 Mar 2007 11:11:38 -0000 1.17 @@ -1 +1 @@ -logrotate-3.7.4.tar.gz +logrotate-3.7.5.tar.gz Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- logrotate.spec 9 Feb 2007 10:20:36 -0000 1.58 +++ logrotate.spec 1 Mar 2007 11:11:38 -0000 1.59 @@ -1,15 +1,17 @@ Summary: Rotates, compresses, removes and mails system log files Name: logrotate -Version: 3.7.4 -Release: 13%{?dist} +Version: 3.7.5 +Release: 1%{?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 -Patch5: logrotate-errorConfiguration.patch +# The source for this package was pulled from cvs. +# Use the following commands to generate the tarball: +# export CVSROOT=:pserver:anonymous at rhlinux.redhat.com:/usr/local/CVS +# cvs login (hit return) +# cvs co logrotate +# cd logrotate +# make create-archive +Source: logrotate-%{version}.tar.gz BuildRequires: libselinux-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,11 +28,6 @@ %prep %setup -q -%patch1 -p1 -b .selinux -%patch2 -p1 -b .fdLeak -%patch3 -p1 -b .sizeOption -%patch4 -p1 -b .widecharPath -%patch5 -p1 -b .errorConfiguration %build make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes @@ -60,6 +57,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status %changelog +* Thu Mar 01 2007 Peter Vrabec 3.7.5-1 +- new upstream release. + * Fri Feb 09 2007 Peter Vrabec 3.7.4-13 - another spec file fixes (#226104) Index: sources =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 24 Jul 2006 12:18:42 -0000 1.21 +++ sources 1 Mar 2007 11:11:38 -0000 1.22 @@ -1 +1 @@ -dcf518fe08ae3825e00b38b909d152d9 logrotate-3.7.4.tar.gz +2b25c645bbcc52abc12ba6a4d52b18e5 logrotate-3.7.5.tar.gz --- logrotate-errorConfiguration.patch DELETED --- --- logrotate-fdLeak.patch DELETED --- --- logrotate-selinux.patch DELETED --- --- logrotate-sizeOption.patch DELETED --- --- logrotate-widecharPath.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 1 11:28:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 06:28:42 -0500 Subject: rpms/firefox/FC-6 firefox.spec,1.165,1.166 Message-ID: <200703011128.l21BSfwh029687@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/firefox/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv29629 Modified Files: firefox.spec Log Message: added fix for #227262 - Can't find jsautocfg64.h per firefox-js.pc Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-6/firefox.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- firefox.spec 26 Feb 2007 22:56:27 -0000 1.165 +++ firefox.spec 1 Mar 2007 11:28:39 -0000 1.166 @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.5.0.10 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -326,9 +326,9 @@ cat > dist/include/${genheader}.h << EOF // This file exists to fix multilib conflicts #if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) -#include "${genheader}64.h" +#include "${genheader#*/}64.h" #else -#include "${genheader}32.h" +#include "${genheader#*/}32.h" #endif EOF done @@ -452,6 +452,9 @@ #--------------------------------------------------------------------- %changelog +* Thu Mar 1 2007 Martin Stransky 1.5.0.10-3 +- added fix for #227262 - Can't find jsautocfg64.h per firefox-js.pc + * Mon Feb 26 2007 Martin Stransky 1.5.0.10-2 - changed __ppc64__ arch tag to __powerpc64__ From fedora-cvs-commits at redhat.com Thu Mar 1 11:30:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 06:30:58 -0500 Subject: rpms/net-snmp/devel net-snmp.spec,1.106,1.107 Message-ID: <200703011130.l21BUw4M031376@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31330 Modified Files: net-snmp.spec Log Message: - fix lm_sensors-devel Requires (#229109) Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- net-snmp.spec 27 Feb 2007 08:51:01 -0000 1.106 +++ net-snmp.spec 1 Mar 2007 11:30:56 -0000 1.107 @@ -7,7 +7,7 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: %{major_ver} -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 License: BSDish @@ -94,7 +94,9 @@ %if %{tcp_wrappers} Requires: tcp_wrappers-devel %endif +%ifarch %{ix86} x86_64 Requires: lm_sensors-devel +%endif %description devel The net-snmp-devel package contains the development libraries and @@ -354,6 +356,9 @@ %{_libdir}/lib*.so.* %changelog +* Thu Mar 1 2007 Radek Vok??l - 5.4-11 +- fix lm_sensors-devel Requires (#229109) + * Mon Feb 26 2007 Vitezslav Crhonek - 5.4-10 - fix net-snmp-config strange values for --libs (#228588) From fedora-cvs-commits at redhat.com Thu Mar 1 12:08:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 07:08:57 -0500 Subject: rpms/openssh/FC-6 openssh.spec,1.99,1.100 Message-ID: <200703011208.l21C8v8k022968@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/openssh/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22954 Modified Files: openssh.spec Log Message: - sync with RHEL-5 Index: openssh.spec =================================================================== RCS file: /cvs/dist/rpms/openssh/FC-6/openssh.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- openssh.spec 30 Nov 2006 11:01:11 -0000 1.99 +++ openssh.spec 1 Mar 2007 12:08:54 -0000 1.100 @@ -61,7 +61,7 @@ Summary: The OpenSSH implementation of SSH protocol versions 1 and 2 Name: openssh Version: 4.3p2 -Release: 14%{?dist}%{?rescue_rel} +Release: 18%{?dist}%{?rescue_rel} URL: http://www.openssh.com/portable.html #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.sig @@ -102,6 +102,8 @@ Patch48: openssh-4.3p2-initscript.patch Patch49: openssh-4.3p2-pam-session.patch Patch50: openssh-4.3p2-gssapi-canohost.patch +Patch51: openssh-4.3p2-mls.patch +Patch52: openssh-4.3p2-selinux-rolechg.patch License: BSD Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -241,6 +243,8 @@ %patch48 -p1 -b .initscript %patch49 -p1 -b .pam-sesssion %patch50 -p1 -b .canohost +%patch51 -p1 -b .mls +%patch52 -p1 -b .rolechg autoreconf @@ -485,6 +489,18 @@ %endif %changelog +* Tue Feb 27 2007 Tomas Mraz - 4.3p2-18 +- reject connection if requested mls range is not obtained (#229278) + +* Fri Feb 9 2007 Tomas Mraz - 4.3p2-17 +- allow selecting non-default roles and audit role changes (#227733) + +* Thu Jan 11 2007 Tomas Mraz - 4.3p2-16 +- support also level selection on unlabeled networks (#220487) + +* Fri Dec 22 2006 Tomas Mraz - 4.3p2-15 +- make sshd work with mls networking (patch by Klaus Weidner) (#220487) + * Thu Nov 30 2006 Tomas Mraz - 4.3p2-14 - fix gssapi with DNS loadbalanced clusters (#216857) From fedora-cvs-commits at redhat.com Thu Mar 1 12:09:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 07:09:42 -0500 Subject: rpms/openssh/FC-6 openssh-4.3p2-mls.patch, NONE, 1.1 openssh-4.3p2-selinux-rolechg.patch, NONE, 1.1 Message-ID: <200703011209.l21C9gnd022994@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/openssh/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22979 Added Files: openssh-4.3p2-mls.patch openssh-4.3p2-selinux-rolechg.patch Log Message: - sync with RHEL-5 openssh-4.3p2-mls.patch: selinux.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- session.c | 2 sshd.c | 2 3 files changed, 149 insertions(+), 14 deletions(-) --- NEW FILE openssh-4.3p2-mls.patch --- --- openssh-4.3p2/selinux.c.mls 2007-01-11 14:22:40.000000000 +0100 +++ openssh-4.3p2/selinux.c 2007-01-11 20:25:27.000000000 +0100 @@ -1,6 +1,7 @@ #include "includes.h" #include "auth.h" #include "log.h" +#include "xmalloc.h" #ifdef WITH_SELINUX #include @@ -8,23 +9,147 @@ #include #include #include +#include + +#ifdef HAVE_LINUX_AUDIT +#include +#include +#include +#endif + extern Authctxt *the_authctxt; +extern int inetd_flag; +extern int rexeced_flag; + +/* Send audit message */ +static int send_audit_message(int success, security_context_t default_context, + security_context_t selected_context) +{ + int rc=0; +#ifdef HAVE_LINUX_AUDIT + char *msg = NULL; + int audit_fd = audit_open(); + security_context_t default_raw=NULL; + security_context_t selected_raw=NULL; + rc = -1; + if (audit_fd < 0) { + if (errno == EINVAL || errno == EPROTONOSUPPORT || + errno == EAFNOSUPPORT) + return 0; /* No audit support in kernel */ + error("Error connecting to audit system."); + return rc; + } + if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) { + error("Error translating default context."); + goto out; + } + if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) { + error("Error translating selected context."); + goto out; + } + if (asprintf(&msg, "sshd: default-context=%s selected-context=%s", + default_context ? default_raw : "?", + selected_context ? selected_raw : "?") < 0) { + error("Error allocating memory."); + goto out; + } + if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE, + msg, NULL, NULL, NULL, success) <= 0) { + error("Error sending audit message."); + goto out; + } + rc = 0; + out: + free(msg); + freecon(default_raw); + freecon(selected_raw); + close(audit_fd); +#endif + return rc; +} +/* from Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c */ +static int mls_range_allowed(security_context_t src, security_context_t dst) +{ + struct av_decision avd; + int retval; + unsigned int bit = CONTEXT__CONTAINS; + + retval = security_compute_av(src, dst, SECCLASS_CONTEXT, bit, &avd); + if (retval || ((bit & avd.allowed) != bit)) + return 0; + + return 1; +} + +static int get_user_context(const char *user, const char *role, const char *level, + security_context_t *context) { + if (role != NULL && role[0]) + return get_default_context_with_rolelevel(user, role, level, NULL, context); + else + return get_default_context_with_level(user, level, NULL, context); +} static const security_context_t selinux_get_user_context(const char *name) { security_context_t user_context=NULL; + security_context_t default_context=NULL; + char *seuser=NULL; char *role=NULL; int ret=-1; - char *seuser=NULL; - char *level=NULL; - - if (the_authctxt) - role=the_authctxt->role; + char *dlevel=NULL; + const char *rlevel=NULL; + context_t con=NULL; + + if (the_authctxt) { + if (the_authctxt->role != NULL) { + char *slash; + role = xstrdup(the_authctxt->role); + if ((slash = strchr(role, '/')) != NULL) { + *slash = '\0'; + rlevel = slash + 1; + } + } + } + + ret = getseuserbyname(name, &seuser, &dlevel); + + if (ret >= 0) { + ret = get_user_context(seuser, role, dlevel, &default_context); + } + + if (ret >= 0) { + /* If launched from xinetd, we must use current level */ + if (inetd_flag && !rexeced_flag) { + security_context_t sshd_context=NULL; + + if (getcon(&sshd_context) < 0) + fatal("failed to allocate security context"); + + con = context_new(sshd_context); + rlevel = context_range_get(con); + freecon(sshd_context); - if (getseuserbyname(name, &seuser, &level)==0) { - if (role != NULL && role[0]) - ret=get_default_context_with_rolelevel(seuser, role, level,NULL,&user_context); - else - ret=get_default_context_with_level(seuser, level, NULL,&user_context); + debug("selinux_get_user_context: current connection level '%s'", rlevel); + } + + if (rlevel != NULL && rlevel[0]) { + ret = get_user_context(seuser, role, rlevel, &user_context); + + if (ret >= 0) { + if (mls_range_allowed(default_context, user_context)) { + send_audit_message(1, default_context, user_context); + logit("permit MLS level %s (user range %s)", rlevel, dlevel); + } else { + send_audit_message(0, default_context, user_context); + if (security_getenforce() > 0) + fatal("deny MLS level %s (user range %s)", rlevel, dlevel); + else + error("deny MLS level %s (user range %s). Continuing in permissive mode", rlevel, dlevel); + } + } + freecon(default_context); + } else { + user_context = default_context; + } } if ( ret < 0 ) { @@ -32,7 +157,13 @@ fatal("Failed to get default security context for %s.", name); else error("Failed to get default security context for %s. Continuing in permissive mode", name); - } + } + + if (con) + context_free(con); + free(role); + free(seuser); + free(dlevel); return user_context; } @@ -40,11 +171,15 @@ if (is_selinux_enabled() > 0) { security_context_t new_tty_context=NULL, user_context=NULL, old_tty_context=NULL; - user_context=selinux_get_user_context(name); + if (getexeccon(&user_context) < 0) { + error("getexeccon() failed: %.100s", strerror(errno)); + return; + } if (getfilecon(tty, &old_tty_context) < 0) { error("getfilecon(%.100s) failed: %.100s", tty, strerror(errno)); } else { + debug("user_context: %s old_tty_context: %s", user_context, old_tty_context); if (security_compute_relabel(user_context,old_tty_context, SECCLASS_CHR_FILE, &new_tty_context) != 0) { --- openssh-4.3p2/sshd.c.mls 2007-01-11 14:22:40.000000000 +0100 +++ openssh-4.3p2/sshd.c 2007-01-11 14:22:40.000000000 +0100 @@ -85,6 +85,7 @@ #include "monitor.h" #include "monitor_wrap.h" #include "monitor_fdpass.h" +#include "selinux.h" #ifdef LIBWRAP #include @@ -1752,6 +1753,7 @@ restore_uid(); } #endif + setup_selinux_exec_context(authctxt->pw->pw_name); #ifdef USE_PAM if (options.use_pam) { do_pam_setcred(1); --- openssh-4.3p2/session.c.mls 2007-01-11 14:22:40.000000000 +0100 +++ openssh-4.3p2/session.c 2007-01-11 14:22:40.000000000 +0100 @@ -1313,8 +1313,6 @@ #endif if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); - - setup_selinux_exec_context(pw->pw_name); } static void openssh-4.3p2-selinux-rolechg.patch: selinux.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 116 insertions(+), 35 deletions(-) --- NEW FILE openssh-4.3p2-selinux-rolechg.patch --- --- openssh-4.3p2/selinux.c.rolechg 2007-02-27 20:56:16.000000000 +0100 +++ openssh-4.3p2/selinux.c 2007-02-27 21:42:09.000000000 +0100 @@ -82,16 +82,80 @@ } static int get_user_context(const char *user, const char *role, const char *level, - security_context_t *context) { - if (role != NULL && role[0]) - return get_default_context_with_rolelevel(user, role, level, NULL, context); - else - return get_default_context_with_level(user, level, NULL, context); + security_context_t *context) { + if (get_default_context_with_level(user, level, NULL, context) != 0) { + /* User may have requested a level completely outside of his + allowed range. We get a context just for auditing as the + range check below will certainly fail for default context. */ + if (get_default_context(user, NULL, context) != 0) { + *context = NULL; + return -1; + } + } + if (role != NULL && role[0]) { + context_t con; + char *type=NULL; + if (get_default_type(role, &type) != 0) { + error("get_default_type: failed to get default type for '%s'", + role); + goto out; + } + con = context_new(*context); + if (!con) { + goto out; + } + context_role_set(con, role); + context_type_set(con, type); + freecon(*context); + *context = strdup(context_str(con)); + context_free(con); + if (!*context) + return -1; + } + if (level != NULL && level[0]) { + /* verify that the requested range is obtained */ + context_t con; + security_context_t obtained_raw; + security_context_t requested_raw; + con = context_new(*context); + if (!con) { + goto out; + } + context_range_set(con, level); + if (selinux_trans_to_raw_context(*context, &obtained_raw) < 0) { + context_free(con); + goto out; + } + if (selinux_trans_to_raw_context(context_str(con), &requested_raw) < 0) { + freecon(obtained_raw); + context_free(con); + goto out; + } + + debug("get_user_context: obtained context '%s' requested context '%s'", + obtained_raw, requested_raw); + if (strcmp(obtained_raw, requested_raw)) { + /* set the context to the real requested one but fail */ + freecon(requested_raw); + freecon(obtained_raw); + freecon(*context); + *context = strdup(context_str(con)); + context_free(con); + return -1; + } + freecon(requested_raw); + freecon(obtained_raw); + context_free(con); + } + return 0; + out: + freecon(*context); + *context = NULL; + return -1; } -static const security_context_t selinux_get_user_context(const char *name) { - security_context_t user_context=NULL; - security_context_t default_context=NULL; +static int selinux_get_user_context(const char *name, + security_context_t *default_context, security_context_t *user_context) { char *seuser=NULL; char *role=NULL; int ret=-1; @@ -99,6 +163,8 @@ const char *rlevel=NULL; context_t con=NULL; + *default_context = NULL; + *user_context = NULL; if (the_authctxt) { if (the_authctxt->role != NULL) { char *slash; @@ -113,7 +179,7 @@ ret = getseuserbyname(name, &seuser, &dlevel); if (ret >= 0) { - ret = get_user_context(seuser, role, dlevel, &default_context); + ret = get_default_context_with_level(seuser, dlevel, NULL, default_context); } if (ret >= 0) { @@ -121,42 +187,38 @@ if (inetd_flag && !rexeced_flag) { security_context_t sshd_context=NULL; - if (getcon(&sshd_context) < 0) + if (getcon_raw(&sshd_context) < 0) fatal("failed to allocate security context"); con = context_new(sshd_context); rlevel = context_range_get(con); freecon(sshd_context); - + if (rlevel !=NULL && dlevel != NULL && strcmp(rlevel, dlevel) == 0) + /* we actually don't change level */ + rlevel = NULL; + debug("selinux_get_user_context: current connection level '%s'", rlevel); } - if (rlevel != NULL && rlevel[0]) { - ret = get_user_context(seuser, role, rlevel, &user_context); + if ((rlevel != NULL && rlevel[0]) || (role != NULL && role[0])) { + ret = get_user_context(seuser, role, rlevel, user_context); - if (ret >= 0) { - if (mls_range_allowed(default_context, user_context)) { - send_audit_message(1, default_context, user_context); + if (ret >= 0 && rlevel != NULL && rlevel[0]) { + /* verify that the requested range is contained in the user range */ + if (mls_range_allowed(*default_context, *user_context)) { logit("permit MLS level %s (user range %s)", rlevel, dlevel); } else { - send_audit_message(0, default_context, user_context); - if (security_getenforce() > 0) - fatal("deny MLS level %s (user range %s)", rlevel, dlevel); - else - error("deny MLS level %s (user range %s). Continuing in permissive mode", rlevel, dlevel); + ret = -1; + error("deny MLS level %s (user range %s)", rlevel, dlevel); } } - freecon(default_context); } else { - user_context = default_context; + *user_context = *default_context; } } if ( ret < 0 ) { - if (security_getenforce() > 0) - fatal("Failed to get default security context for %s.", name); - else - error("Failed to get default security context for %s. Continuing in permissive mode", name); + error("Failed to get default security context for %s.", name); } if (con) @@ -164,7 +226,7 @@ free(role); free(seuser); free(dlevel); - return user_context; + return ret; } void setup_selinux_pty(const char *name, const char *tty) { @@ -201,18 +263,37 @@ } void setup_selinux_exec_context(char *name) { - if (is_selinux_enabled() > 0) { - security_context_t user_context=selinux_get_user_context(name); - if (setexeccon(user_context)) { - if (security_getenforce() > 0) - fatal("Failed to set exec security context %s for %s.", user_context, name); + int ret = 0; + security_context_t default_context = NULL; + security_context_t user_context = NULL; + ret = selinux_get_user_context(name, &default_context, &user_context); + if (ret >= 0) { + ret = setexeccon(user_context); + if (ret < 0) { + error("Failed to set exec security context %s for %s.", user_context, name); + } + } + if (user_context == NULL) { + user_context = default_context; + } + if (ret < 0 || user_context != default_context) { + /* audit just the case when user changed a role or there was + a failure */ + send_audit_message(ret >= 0, default_context, user_context); + } + if (ret < 0) { + if (security_getenforce() > 0) + fatal("SELinux failure. Aborting connection."); else - error("Failed to set exec security context %s for %s. Continuing in permissive mode", user_context, name); + error("SELinux failure. Continuing in permissive mode."); } - if (user_context) { + if (user_context && user_context != default_context) { freecon(user_context); } + if (default_context) { + freecon(default_context); + } } } From fedora-cvs-commits at redhat.com Thu Mar 1 12:30:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 07:30:40 -0500 Subject: rpms/psmisc/devel psmisc-22.3-fuser-ipv6.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 psmisc.spec, 1.32, 1.33 sources, 1.13, 1.14 psmisc-22.1-fuser-listsigs.patch, 1.1, NONE Message-ID: <200703011230.l21CUe18016409@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/psmisc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16390 Modified Files: .cvsignore psmisc.spec sources Added Files: psmisc-22.3-fuser-ipv6.patch Removed Files: psmisc-22.1-fuser-listsigs.patch Log Message: * Thu Mar 1 2007 Karel Zak 22.3-1 - update to upstream 22.3 - backport ipv6 bugfix from upstream CVS - clean up spec file psmisc-22.3-fuser-ipv6.patch: fuser.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE psmisc-22.3-fuser-ipv6.patch --- --- psmisc-22.3/src/fuser.c.kzak 2007-03-01 13:20:17.000000000 +0100 +++ psmisc-22.3/src/fuser.c 2007-03-01 13:01:38.000000000 +0100 @@ -249,7 +249,7 @@ ip_tmp->name = this_name; ip_tmp->lcl_port = lcl_port; ip_tmp->rmt_port = rmt_port; - memcpy(&(ip_tmp->rmt_port),&(rmt_port),sizeof(struct in6_addr)); + memcpy(&(ip_tmp->rmt_address),&(rmt_address),sizeof(struct in6_addr)); ip_tmp->next = ip_head; *ip_list = ip_tmp; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/psmisc/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 19 Jul 2006 22:10:54 -0000 1.13 +++ .cvsignore 1 Mar 2007 12:30:38 -0000 1.14 @@ -1 +1 @@ -psmisc-22.2.tar.gz +psmisc-22.3.tar.gz Index: psmisc.spec =================================================================== RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- psmisc.spec 19 Jul 2006 22:23:26 -0000 1.32 +++ psmisc.spec 1 Mar 2007 12:30:38 -0000 1.33 @@ -1,7 +1,7 @@ -Summary: Utilities for managing processes on your system. +Summary: Utilities for managing processes on your system Name: psmisc -Version: 22.2 -Release: 5 +Version: 22.3 +Release: 1%{?dist} License: BSD/GPL Group: Applications/System Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz @@ -9,10 +9,11 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libselinux-devel -BuildRequires: gettext-devel +BuildRequires: gettext BuildRequires: ncurses-devel -Patch0: psmisc-22.1-fuser-listsigs.patch +# backport from upstream CVS +Patch0: psmisc-22.3-fuser-ipv6.patch %description The psmisc package contains utilities for managing processes on your @@ -29,7 +30,7 @@ %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure --prefix=/usr --enable-selinux -make +make %install rm -rf $RPM_BUILD_ROOT @@ -57,6 +58,11 @@ %{_mandir}/man1/pstree.1* %changelog +* Thu Mar 1 2007 Karel Zak 22.3-1 +- update to upstream 22.3 +- backport ipv6 bugfix from upstream CVS +- clean up spec file + * Wed Jul 19 2006 Karel Zak - 22.2-5 - spec file cleanup & rebuild @@ -194,7 +200,7 @@ - automated rebuild * Thu May 16 2002 Bernhard Rosenkraenzer 20.2-4 -- Autogenerate the signal list from %{_includedir}/bits/signum.h +- Autogenerate the signal list from _includedir/bits/signum.h to make sure it works on all arches and doesn't break again. * Wed May 8 2002 Trond Eivind Glomsrod 20.2-3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/psmisc/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 19 Jul 2006 22:10:54 -0000 1.13 +++ sources 1 Mar 2007 12:30:38 -0000 1.14 @@ -1 +1 @@ -77737c817a40ef2c160a7194b5b64337 psmisc-22.2.tar.gz +0c44b995d068a221daf35d23e13db419 psmisc-22.3.tar.gz --- psmisc-22.1-fuser-listsigs.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 1 13:05:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 08:05:39 -0500 Subject: rpms/groff/devel groff.spec,1.44,1.45 Message-ID: <200703011305.l21D5d7W015685@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15593 Modified Files: groff.spec Log Message: Update release. Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- groff.spec 28 Feb 2007 14:04:45 -0000 1.44 +++ groff.spec 1 Mar 2007 13:05:37 -0000 1.45 @@ -3,7 +3,7 @@ Summary: A document formatting system Name: groff Version: 1.18.1.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing URL: http://groff.ffii.org From fedora-cvs-commits at redhat.com Thu Mar 1 13:15:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 08:15:00 -0500 Subject: rpms/fonts-japanese/devel fonts-japanese.spec,1.18,1.19 Message-ID: <200703011315.l21DF0hh022989@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/fonts-japanese/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22934 Modified Files: fonts-japanese.spec Log Message: * Thu Mar 1 2007 Akira TAGOH - 0.20061016-3 - cleanup spec file. - updated mplus to 2.2.4 Index: fonts-japanese.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fonts-japanese.spec 24 Nov 2006 12:57:38 -0000 1.18 +++ fonts-japanese.spec 1 Mar 2007 13:14:58 -0000 1.19 @@ -18,16 +18,16 @@ %define kappa Kappa20-0.396 %define shinonome shinonome-0.9.11 %define warabi12 warabi12-0.19a -%define mplus mplus_bitmap_fonts-2.2.2 +%define mplus mplus_bitmap_fonts-2.2.4 %define vft vine-fonttools-0.1 Name: fonts-japanese Version: 0.20061016 -Release: 2%{?dist} +Release: 3%{?dist} License: Distributable Group: User Interface/X BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gzip xorg-x11-font-utils ## files in ttfonts-ja @@ -37,7 +37,7 @@ Source3: cidfmap.ja Source4: CIDFnmap.ja ## FIXME: the below lines will be removed in the future. -## Source0: http://downloads.sourceforge.jp/efont/4767/%{kochisubst}.tar.bz2 +## Source0: http://downloads.sourceforge.jp/efont/4767/%{kochisubst}.tar.bz2 #Source5: %{ksnonaga10}.tar.bz2 #Source6: fonts.alias.kk ## files in jisksp14 @@ -92,7 +92,8 @@ Requires(post): ttmkfdir >= 3.0.6, mkfontdir, fontconfig, /usr/sbin/chkfontpath Requires(postun): fontconfig, /usr/sbin/chkfontpath -Obsoletes: ttfonts-ja jisksp14 jisksp16-1990 kappa20 knm_new fonts-ja +Provides: ttfonts-ja = 1.2-37, jisksp14 = 0.1-16, jisksp16-1990 = 0.1-16, kappa20 = 0.3-15, knm_new = 1.1-16, fonts-ja = 8.0-16 +Obsoletes: ttfonts-ja <= 1.2-37, jisksp14 <= 0.1-16, jisksp16-1990 <= 0.1-16, kappa20 <= 0.3-15, knm_new <= 1.1-16, fonts-ja <= 8.0-16 %description This package provides the free Japanese Bitmap/TrueType fonts. @@ -387,11 +388,15 @@ %ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir %{ttfontdir}/*ttf %{bmpfontdir} -%{cidmapdir}/FAPIcidfmap.ja -%{cidmapdir}/cidfmap.ja -%{cidmapdir}/CIDFnmap.ja +%config %{cidmapdir}/FAPIcidfmap.ja +%config %{cidmapdir}/cidfmap.ja +%config %{cidmapdir}/CIDFnmap.ja %changelog +* Thu Mar 1 2007 Akira TAGOH - 0.20061016-3 +- cleanup spec file. +- updated mplus to 2.2.4 + * Fri Nov 24 2006 Akira TAGOH - 0.20061016-2 - added CIDFnmap.ja (#215980) From fedora-cvs-commits at redhat.com Thu Mar 1 13:17:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 08:17:51 -0500 Subject: rpms/fonts-japanese/devel fonts-japanese.spec,1.19,1.20 Message-ID: <200703011317.l21DHpSi024952@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/fonts-japanese/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24896 Modified Files: fonts-japanese.spec Log Message: more cleanup. Index: fonts-japanese.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fonts-japanese.spec 1 Mar 2007 13:14:58 -0000 1.19 +++ fonts-japanese.spec 1 Mar 2007 13:17:49 -0000 1.20 @@ -90,8 +90,8 @@ Summary: Free Japanese Bitmap/TrueType fonts -Requires(post): ttmkfdir >= 3.0.6, mkfontdir, fontconfig, /usr/sbin/chkfontpath -Requires(postun): fontconfig, /usr/sbin/chkfontpath +Requires(post): ttmkfdir >= 3.0.6, mkfontdir, /usr/bin/fc-cache, /usr/sbin/chkfontpath +Requires(postun): /usr/bin/fc-cache, /usr/sbin/chkfontpath Provides: ttfonts-ja = 1.2-37, jisksp14 = 0.1-16, jisksp16-1990 = 0.1-16, kappa20 = 0.3-15, knm_new = 1.1-16, fonts-ja = 8.0-16 Obsoletes: ttfonts-ja <= 1.2-37, jisksp14 <= 0.1-16, jisksp16-1990 <= 0.1-16, kappa20 <= 0.3-15, knm_new <= 1.1-16, fonts-ja <= 8.0-16 @@ -355,7 +355,9 @@ /usr/sbin/chkfontpath -q -a %{ttfontdir} } mkfontdir %{bmpfontdir} && /usr/sbin/chkfontpath -q -a %{bmpfontdir} - fc-cache 2> /dev/null + if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache /usr/share/fonts + fi } %postun @@ -363,8 +365,10 @@ if [ "$1" = "0" ]; then /usr/sbin/chkfontpath -q -r %{ttfontdir} /usr/sbin/chkfontpath -q -r %{bmpfontdir} + if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache /usr/share/fonts + fi fi - fc-cache 2> /dev/null } %files From fedora-cvs-commits at redhat.com Thu Mar 1 13:35:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 08:35:40 -0500 Subject: rpms/fonts-japanese/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200703011335.l21DZeZb026065@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/fonts-japanese/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26050 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-japanese/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Oct 2006 08:42:31 -0000 1.5 +++ .cvsignore 1 Mar 2007 13:35:38 -0000 1.6 @@ -19,3 +19,4 @@ xfonts_jp.tgz kochi-substitute-nonaga10-20030809.tar.bz2 sazanami-20061016.tar.bz2 +mplus_bitmap_fonts-2.2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-japanese/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Oct 2006 08:42:31 -0000 1.5 +++ sources 1 Mar 2007 13:35:38 -0000 1.6 @@ -8,9 +8,9 @@ e0a103ceeffe0aa1c5670458f47452b3 kaname_k12_bdf.tar.gz 065920714d022cfd225feb6d80b03238 knm_new.tar.gz a412bc6920d29be2689b3c3192bcdbd2 marumoji.tgz -bd5bbfcce00bc5dca42e36731bffd771 mplus_bitmap_fonts-2.2.2.tar.gz 38ce9221d128383a3f9f50eb641da424 shinonome-0.9.11-src.tar.bz2 c6b7771e4f00e310fe807b3245fd316e vine-fonttools-0.1.tgz e0e1d3b139159a2af09bc9867c9a654b warabi12-0.19a.tar.gz fa5981d270f432d36818329c8878ba6e xfonts_jp.tgz b312f77829011547b19fc16956dc6f12 sazanami-20061016.tar.bz2 +a97a99acbee54976407dec828d03850c mplus_bitmap_fonts-2.2.4.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 1 14:03:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 09:03:12 -0500 Subject: rpms/groff/devel groff.spec,1.45,1.46 Message-ID: <200703011403.l21E3Cl0019687@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19672 Modified Files: groff.spec Log Message: Update spec. Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- groff.spec 1 Mar 2007 13:05:37 -0000 1.45 +++ groff.spec 1 Mar 2007 14:03:10 -0000 1.46 @@ -110,7 +110,7 @@ #PATH=$PATH:%{_prefix}/X11R6/bin #autoconf %configure --enable-multibyte -make %{?_smp_mflags} +make (cd doc && makeinfo groff.texinfo) %if %{with_x} cd src/xditview From fedora-cvs-commits at redhat.com Thu Mar 1 14:31:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 09:31:25 -0500 Subject: rpms/groff/devel groff.spec,1.46,1.47 Message-ID: <200703011431.l21EVP8d026412@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26296 Modified Files: groff.spec Log Message: Update spec. Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- groff.spec 1 Mar 2007 14:03:10 -0000 1.46 +++ groff.spec 1 Mar 2007 14:31:22 -0000 1.47 @@ -195,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac rm -rf $RPM_BUILD_ROOT%{_libdir}/groff -rm -rf $RPM_BUILD_ROOT%{_libdir} %clean rm -rf ${RPM_BUILD_ROOT} @@ -216,10 +215,10 @@ %doc doc/meintro.me doc/meref.me doc/pic.ms %{_datadir}/groff %{_infodir}/groff* -%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/afmname -%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed -%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts -%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/groffer/version.sh +#%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/afmname +#%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed +#%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts +#%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/groffer/version.sh %files perl %defattr(-,root,root,-) From fedora-cvs-commits at redhat.com Thu Mar 1 14:54:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 09:54:54 -0500 Subject: rpms/groff/devel groff.spec,1.47,1.48 Message-ID: <200703011454.l21EssYt004984@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4862 Modified Files: groff.spec Log Message: Update spec. Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- groff.spec 1 Mar 2007 14:31:22 -0000 1.47 +++ groff.spec 1 Mar 2007 14:54:52 -0000 1.48 @@ -191,7 +191,7 @@ # installed, but not packaged in rpm mkdir -p $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/ mv $RPM_BUILD_ROOT%{_libdir}/groff/groffer/* $RPM_BUILD_ROOT/%{_datadir}/groff/%{version}/groffer/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_libdir}/X11/app-defaults +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_prefix}/lib/X11/app-defaults rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac rm -rf $RPM_BUILD_ROOT%{_libdir}/groff @@ -215,10 +215,6 @@ %doc doc/meintro.me doc/meref.me doc/pic.ms %{_datadir}/groff %{_infodir}/groff* -#%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/afmname -#%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed -#%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts -#%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/groffer/version.sh %files perl %defattr(-,root,root,-) From fedora-cvs-commits at redhat.com Thu Mar 1 14:58:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 09:58:10 -0500 Subject: rpms/psmisc/devel psmisc.spec,1.33,1.34 Message-ID: <200703011458.l21EwAIk007533@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/psmisc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7482 Modified Files: psmisc.spec Log Message: add smp flag Index: psmisc.spec =================================================================== RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- psmisc.spec 1 Mar 2007 12:30:38 -0000 1.33 +++ psmisc.spec 1 Mar 2007 14:58:08 -0000 1.34 @@ -30,7 +30,7 @@ %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure --prefix=/usr --enable-selinux -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT From fedora-cvs-commits at redhat.com Thu Mar 1 15:13:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 10:13:37 -0500 Subject: rpms/vlock/devel vlock.spec,1.21,1.22 Message-ID: <200703011513.l21FDb1i019069@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/vlock/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19019 Modified Files: vlock.spec Log Message: * Thu Mar 1 2007 Karel Zak - 1.3-24 - fix #226530 - Merge Review: vlock Index: vlock.spec =================================================================== RCS file: /cvs/dist/rpms/vlock/devel/vlock.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- vlock.spec 19 Jul 2006 22:17:03 -0000 1.21 +++ vlock.spec 1 Mar 2007 15:13:34 -0000 1.22 @@ -1,14 +1,14 @@ -Summary: A program which locks one or more virtual consoles. +Summary: A program which locks one or more virtual consoles Name: vlock Version: 1.3 -Release: 23 +Release: 24%{?dist} License: GPL Group: Applications/System Source: ftp://tsx-11.mit.edu:/pub/linux/sources/usr.bin/vlock-1.3.tar.gz Requires: pam >= 0.59, /etc/pam.d/system-auth Buildrequires: pam-devel -BuildRoot: %{_tmppath}/vlock +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: vlock-1.3-system-auth.patch Patch1: vlock-1.3-morepam.patch @@ -25,7 +25,7 @@ Install vlock if you need to disable access to one console or to all virtual consoles. -%prep +%prep %setup -q %patch0 -p1 -b .system-auth %patch1 -p1 -b .morepam @@ -33,7 +33,7 @@ %patch3 -p1 -b .gcc %build -make RPM_OPT_FLAGS="${RPM_OPT_FLAGS}" +make RPM_OPT_FLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -49,12 +49,15 @@ %files %defattr(-,root,root) -%config /etc/pam.d/vlock +%doc COPYING README +%config(noreplace) %{_sysconfdir}/pam.d/vlock %{_bindir}/vlock %{_mandir}/man1/vlock.1* - %changelog +* Thu Mar 1 2007 Karel Zak - 1.3-24 +- fix #226530 - Merge Review: vlock + * Wed Jul 19 2006 Karel Zak - 1.3-23 - spec file cleanup & rebuild From fedora-cvs-commits at redhat.com Thu Mar 1 15:14:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 10:14:08 -0500 Subject: rpms/pm-utils/devel radeontool-fix-option-handling.diff,1.1,1.2 Message-ID: <200703011514.l21FE8UJ019514@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/pm-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19393 Modified Files: radeontool-fix-option-handling.diff Log Message: - fix the optioning handling fix. radeontool-fix-option-handling.diff: radeontool.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) Index: radeontool-fix-option-handling.diff =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/radeontool-fix-option-handling.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- radeontool-fix-option-handling.diff 20 Feb 2007 20:11:44 -0000 1.1 +++ radeontool-fix-option-handling.diff 1 Mar 2007 15:14:06 -0000 1.2 @@ -1,18 +1,19 @@ --- radeontool.c.options 2007-02-20 14:48:20.000000000 -0500 +++ radeontool.c 2007-02-20 14:53:07.000000000 -0500 -@@ -320,18 +320,20 @@ +@@ -320,18 +320,21 @@ int main(int argc,char *argv[]) { -+ while (argc > 1) { ++ int found_other = 0; ++ while (argc > 1 && !found_other) { + if(strcmp(argv[1],"--debug") == 0) { + debug=1; + argv++; argc--; -+ } -+ if(strncmp(argv[1],"--skip=",7) == 0) { ++ } else if(strncmp(argv[1],"--skip=",7) == 0) { + skip=atoi(argv[1]+7); + argv++; argc--; -+ continue; ++ } else { ++ found_other = 1; + } + } if(argc == 1) { From fedora-cvs-commits at redhat.com Thu Mar 1 15:31:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 10:31:33 -0500 Subject: rpms/gawk/devel gawk.spec,1.47,1.48 Message-ID: <200703011531.l21FVXfW025384@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/gawk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25140 Modified Files: gawk.spec Log Message: add -p to %install Index: gawk.spec =================================================================== RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gawk.spec 12 Feb 2007 13:50:45 -0000 1.47 +++ gawk.spec 1 Mar 2007 15:31:30 -0000 1.48 @@ -64,7 +64,7 @@ %check make check -%install +%install -p rm -rf $RPM_BUILD_ROOT make install DESTDIR=${RPM_BUILD_ROOT} From fedora-cvs-commits at redhat.com Thu Mar 1 15:37:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 10:37:51 -0500 Subject: rpms/gawk/devel gawk.spec,1.48,1.49 Message-ID: <200703011537.l21FbpIg023702@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/gawk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23688 Modified Files: gawk.spec Log Message: fix previous stupid commit Index: gawk.spec =================================================================== RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gawk.spec 1 Mar 2007 15:31:30 -0000 1.48 +++ gawk.spec 1 Mar 2007 15:37:49 -0000 1.49 @@ -64,7 +64,7 @@ %check make check -%install -p +%install rm -rf $RPM_BUILD_ROOT make install DESTDIR=${RPM_BUILD_ROOT} From fedora-cvs-commits at redhat.com Thu Mar 1 15:41:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 10:41:42 -0500 Subject: rpms/vlock/devel vlock.spec,1.22,1.23 Message-ID: <200703011541.l21Ffgdh023765@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/vlock/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23751 Modified Files: vlock.spec Log Message: * Thu Mar 1 2007 Karel Zak - 1.3-25 - add missing -p to install calls Index: vlock.spec =================================================================== RCS file: /cvs/dist/rpms/vlock/devel/vlock.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- vlock.spec 1 Mar 2007 15:13:34 -0000 1.22 +++ vlock.spec 1 Mar 2007 15:41:40 -0000 1.23 @@ -1,7 +1,7 @@ Summary: A program which locks one or more virtual consoles Name: vlock Version: 1.3 -Release: 24%{?dist} +Release: 25%{?dist} License: GPL Group: Applications/System Source: ftp://tsx-11.mit.edu:/pub/linux/sources/usr.bin/vlock-1.3.tar.gz @@ -40,9 +40,9 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT/etc/pam.d -install -m 755 vlock $RPM_BUILD_ROOT%{_bindir}/ -install -m 644 vlock.1 $RPM_BUILD_ROOT%{_mandir}/man1/ -install -m 644 vlock.pamd $RPM_BUILD_ROOT/etc/pam.d/vlock +install -p -m 755 vlock $RPM_BUILD_ROOT%{_bindir}/ +install -p -m 644 vlock.1 $RPM_BUILD_ROOT%{_mandir}/man1/ +install -p -m 644 vlock.pamd $RPM_BUILD_ROOT/etc/pam.d/vlock %clean rm -rf $RPM_BUILD_ROOT @@ -55,6 +55,9 @@ %{_mandir}/man1/vlock.1* %changelog +* Thu Mar 1 2007 Karel Zak - 1.3-25 +- add missing -p to install calls + * Thu Mar 1 2007 Karel Zak - 1.3-24 - fix #226530 - Merge Review: vlock @@ -82,7 +85,7 @@ * Wed Aug 3 2005 Karel Zak 1.3-20 - #164950 - call account management and credential reinitialization functions - (patch by Nalin Dahyabhai) + (patch by Nalin Dahyabhai) * Tue May 10 2005 Karel Zak 1.3-19 - fix debuginfo From fedora-cvs-commits at redhat.com Thu Mar 1 15:48:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 10:48:09 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.295, 1.296 config-powerpc64-iseries, 1.22, 1.23 config-s390-generic, 1.24, 1.25 Message-ID: <200703011548.l21Fm9R0023941@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv23907/configs Modified Files: config-generic config-powerpc64-iseries config-s390-generic Log Message: update git-wireless-dev.patch from 2007-02-27 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- config-generic 28 Feb 2007 21:09:25 -0000 1.295 +++ config-generic 1 Mar 2007 15:48:07 -0000 1.296 @@ -1082,7 +1082,6 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m -CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_QLA3XXX=m CONFIG_ATL1=m @@ -1193,9 +1192,9 @@ # # Wireless 802.11b ISA/PCI cards support # -CONFIG_D80211=m -CONFIG_D80211_LEDS=y -# CONFIG_D80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -1205,6 +1204,7 @@ CONFIG_IEEE80211_SOFTMAC_DEBUG=y CONFIG_CFG80211=m CONFIG_CFG80211_WEXT_COMPAT=y +# CONFIG_NL80211 is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set # CONFIG_IPW2100_DEBUG is not set @@ -1212,15 +1212,15 @@ CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set -CONFIG_BCM43XX_D80211=m -CONFIG_BCM43XX_D80211_PCI=y -CONFIG_BCM43XX_D80211_PCMCIA=y -CONFIG_BCM43XX_D80211_DEBUG=y -CONFIG_BCM43XX_D80211_DMA=y -CONFIG_BCM43XX_D80211_PIO=y -CONFIG_BCM43XX_D80211_DMA_AND_PIO_MODE=y -# CONFIG_BCM43XX_D80211_DMA_MODE is not set -# CONFIG_BCM43XX_D80211_PIO_MODE is not set +CONFIG_BCM43XX_MAC80211=m +CONFIG_BCM43XX_MAC80211_PCI=y +CONFIG_BCM43XX_MAC80211_PCMCIA=y +CONFIG_BCM43XX_MAC80211_DEBUG=y +CONFIG_BCM43XX_MAC80211_DMA=y +CONFIG_BCM43XX_MAC80211_PIO=y +CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set +# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set CONFIG_RT2X00=y CONFIG_RT2400PCI=m # CONFIG_RT2400PCI_DEBUG is not set @@ -1236,8 +1236,10 @@ CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m -CONFIG_ZD1211RW_D80211=m -# CONFIG_ZD1211RW_D80211_DEBUG is not set +CONFIG_ZD1211RW_MAC80211=m +# CONFIG_ZD1211RW_MAC80211_DEBUG is not set +CONFIG_RTL818X=y +CONFIG_RTL8187=m CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- config-powerpc64-iseries 22 Feb 2007 22:08:21 -0000 1.22 +++ config-powerpc64-iseries 1 Mar 2007 15:48:07 -0000 1.23 @@ -63,7 +63,7 @@ CONFIG_SCSI_IBMVSCSI=m CONFIG_SERIAL_ICOM=m # CONFIG_ISDN is not set -# CONFIG_D80211 is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set # CONFIG_DVB is not set # CONFIG_VIDEO_DEV is not set Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- config-s390-generic 22 Feb 2007 22:08:21 -0000 1.24 +++ config-s390-generic 1 Mar 2007 15:48:07 -0000 1.25 @@ -116,7 +116,7 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_NET_RADIO is not set -# CONFIG_D80211 is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set # CONFIG_B44 is not set From fedora-cvs-commits at redhat.com Thu Mar 1 15:48:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 10:48:09 -0500 Subject: rpms/kernel/devel git-wireless-dev.patch, 1.1, 1.2 kernel-2.6.spec, 1.2959, 1.2960 Message-ID: <200703011548.l21Fm9nu023933@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23907 Modified Files: git-wireless-dev.patch kernel-2.6.spec Log Message: update git-wireless-dev.patch from 2007-02-27 git-wireless-dev.patch: CREDITS | 33 MAINTAINERS | 54 drivers/Kconfig | 2 drivers/Makefile | 1 drivers/net/wireless/Kconfig | 2 drivers/net/wireless/Makefile | 3 drivers/net/wireless/mac80211/Kconfig | 6 drivers/net/wireless/mac80211/Makefile | 6 drivers/net/wireless/mac80211/README | 2 drivers/net/wireless/mac80211/adm8211/Kconfig | 24 drivers/net/wireless/mac80211/adm8211/Makefile | 1 drivers/net/wireless/mac80211/adm8211/adm8211.c | 2188 +++++++ drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 ++ drivers/net/wireless/mac80211/bcm43xx/Kconfig | 99 drivers/net/wireless/mac80211/bcm43xx/Makefile | 17 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 870 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1297 ++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1051 +++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 89 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 3962 ++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pci.c | 61 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pci.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4234 +++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 307 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.c | 202 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.h | 83 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 615 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 215 drivers/net/wireless/mac80211/p54/Kconfig | 9 drivers/net/wireless/mac80211/p54/Makefile | 4 drivers/net/wireless/mac80211/p54/net2280.h | 452 + drivers/net/wireless/mac80211/p54/prism54.h | 77 drivers/net/wireless/mac80211/p54/prism54common.c | 807 ++ drivers/net/wireless/mac80211/p54/prism54common.h | 304 drivers/net/wireless/mac80211/p54/prism54magic.h | 77 drivers/net/wireless/mac80211/p54/prism54pci.c | 698 ++ drivers/net/wireless/mac80211/p54/prism54pci.h | 106 drivers/net/wireless/mac80211/p54/prism54usb.c | 946 +++ drivers/net/wireless/mac80211/p54/prism54usb.h | 133 drivers/net/wireless/mac80211/rt2x00/Kconfig | 83 drivers/net/wireless/mac80211/rt2x00/Makefile | 5 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 2985 +++++++++ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 967 +++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 3297 ++++++++++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1234 +++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 3131 ++++++++++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 739 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1268 ++++ drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 44 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 81 drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 3827 ++++++++++++ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1398 ++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 3467 +++++++++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 980 +++ drivers/net/wireless/mac80211/rtl818x/Kconfig | 8 drivers/net/wireless/mac80211/rtl818x/Makefile | 2 drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 712 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 738 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 28 drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 175 drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19 drivers/net/wireless/mac80211/zd1211rw/Makefile | 11 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1674 +++++ drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 909 ++ drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 705 ++ drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 156 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 81 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 373 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 274 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1324 ++++ drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241 drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82 drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29 drivers/ssb/Kconfig | 93 drivers/ssb/Makefile | 14 drivers/ssb/core.c | 956 +++ drivers/ssb/driver_chipcommon/chipcommon.c | 402 + drivers/ssb/driver_mips/mips.c | 258 drivers/ssb/driver_pci/pcicore.c | 556 + drivers/ssb/pci.c | 667 ++ drivers/ssb/pcihost_wrapper.c | 104 drivers/ssb/pcmcia.c | 256 drivers/ssb/scan.c | 427 + drivers/ssb/ssb_private.h | 152 drivers/usb/host/Kconfig | 10 drivers/usb/host/ohci-hcd.c | 4 drivers/usb/host/ohci-ssb.c | 193 include/linux/Kbuild | 2 include/linux/crc-itu-t.h | 27 include/linux/eeprom_93cx6.h | 77 include/linux/ieee80211.h | 330 + include/linux/netdevice.h | 6 include/linux/nl80211.h | 275 include/linux/ssb/ssb.h | 388 + include/linux/ssb/ssb_driver_chipcommon.h | 387 + include/linux/ssb/ssb_driver_extif.h | 163 include/linux/ssb/ssb_driver_mips.h | 47 include/linux/ssb/ssb_driver_pci.h | 108 include/linux/ssb/ssb_regs.h | 294 include/net/cfg80211.h | 176 include/net/iw_handler.h | 3 include/net/mac80211.h | 1079 +++ include/net/wireless.h | 150 lib/Kconfig | 16 lib/Makefile | 3 lib/crc-itu-t.c | 64 lib/eeprom_93cx6.c | 344 + net/Kconfig | 3 net/Makefile | 2 net/core/Makefile | 1 net/core/dev.c | 33 net/core/wireless.c | 2353 ------- net/mac80211/Kconfig | 73 net/mac80211/Makefile | 26 net/mac80211/aes_ccm.c | 155 net/mac80211/aes_ccm.h | 26 net/mac80211/fifo_qdisc.c | 102 net/mac80211/hostapd_ioctl.h | 434 + net/mac80211/ieee80211.c | 4940 ++++++++++++++++ net/mac80211/ieee80211_cfg.c | 108 net/mac80211/ieee80211_cfg.h | 9 net/mac80211/ieee80211_common.h | 98 net/mac80211/ieee80211_i.h | 720 ++ net/mac80211/ieee80211_iface.c | 372 + net/mac80211/ieee80211_ioctl.c | 3304 ++++++++++ net/mac80211/ieee80211_key.h | 89 net/mac80211/ieee80211_led.c | 91 net/mac80211/ieee80211_led.h | 32 net/mac80211/ieee80211_rate.c | 140 net/mac80211/ieee80211_rate.h | 161 net/mac80211/ieee80211_scan.c | 344 + net/mac80211/ieee80211_sta.c | 3013 +++++++++ net/mac80211/ieee80211_sysfs.c | 727 ++ net/mac80211/ieee80211_sysfs.h | 12 net/mac80211/ieee80211_sysfs_sta.c | 438 + net/mac80211/michael.c | 104 net/mac80211/michael.h | 20 net/mac80211/rc80211_simple.c | 399 + net/mac80211/sta_info.c | 461 + net/mac80211/sta_info.h | 150 net/mac80211/tkip.c | 341 + net/mac80211/tkip.h | 36 net/mac80211/wep.c | 328 + net/mac80211/wep.h | 40 net/mac80211/wme.c | 679 ++ net/mac80211/wme.h | 38 net/mac80211/wpa.c | 846 ++ net/mac80211/wpa.h | 34 net/wireless/Kconfig | 31 net/wireless/Makefile | 17 net/wireless/core.c | 276 net/wireless/core.h | 73 net/wireless/nl80211.c | 1050 +++ net/wireless/nl80211.h | 17 net/wireless/sysfs.c | 125 net/wireless/sysfs.h | 9 net/wireless/wext-common.c | 663 ++ net/wireless/wext-compat.c | 819 ++ net/wireless/wext-export.c | 29 net/wireless/wext-mod.c | 20 net/wireless/wext-old.c | 1461 ++++ net/wireless/wext.h | 51 183 files changed, 86281 insertions(+), 2390 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 git-wireless-dev.patch Index: git-wireless-dev.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/git-wireless-dev.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- git-wireless-dev.patch 22 Feb 2007 19:33:29 -0000 1.1 +++ git-wireless-dev.patch 1 Mar 2007 15:48:05 -0000 1.2 @@ -1,19409 +1,16807 @@ -This patch aggregates the changes available in the wireless-dev git -tree. This includes the new wireless stack, the associated drivers, the -new wireless configuration mechanisms, and some b44 changes related to -hardware in common with bcm43xx (i.e. the SSB bus). - -This is the output of 'git diff from-linus..mm-master' on 22 Feb 2007 on -the tree available here: - - git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git - -Current from-linus: c8f71b01a50597e298dc3214a2f2be7b8d31170c -Current mm-master: f0142f49c820e1b169eea09c46cea8548430eab2 -Current master: db1eee24ed04ea33587f899b00dde9be8cd2e7e1 - - CREDITS | 33 - MAINTAINERS | 54 - drivers/Kconfig | 2 - drivers/Makefile | 1 - drivers/net/Kconfig | 11 - drivers/net/b44.c | 711 +- - drivers/net/b44.h | 81 - drivers/net/wireless/Kconfig | 2 - drivers/net/wireless/Makefile | 3 - drivers/net/wireless/d80211/Kconfig | 5 - drivers/net/wireless/d80211/Makefile | 5 - drivers/net/wireless/d80211/README | 2 - drivers/net/wireless/d80211/adm8211/Kconfig | 24 - drivers/net/wireless/d80211/adm8211/Makefile | 1 - drivers/net/wireless/d80211/adm8211/adm8211.c | 2197 ++++++++ - drivers/net/wireless/d80211/adm8211/adm8211.h | 622 ++ - drivers/net/wireless/d80211/bcm43xx/Kconfig | 99 - drivers/net/wireless/d80211/bcm43xx/Makefile | 17 - drivers/net/wireless/d80211/bcm43xx/bcm43xx.h | 880 +++ - drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c | 433 + - drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.h | 110 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.c | 1297 ++++ - drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.h | 361 + - drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.c | 300 + - drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.h | 56 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_lo.c | 1051 +++ - drivers/net/wireless/d80211/bcm43xx/bcm43xx_lo.h | 89 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c | 3958 ++++++++++++++ - drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.h | 156 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_pci.c | 61 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_pci.h | 22 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_pcmcia.c | 163 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_pcmcia.h | 22 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.c | 4112 ++++++++++++++ - drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.h | 307 + - drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.c | 671 ++ - drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.h | 170 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_power.c | 82 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_power.h | 41 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_sysfs.c | 232 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_sysfs.h | 9 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_tables.c | 376 + - drivers/net/wireless/d80211/bcm43xx/bcm43xx_tables.h | 28 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_vstack.c | 202 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_vstack.h | 83 - drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.c | 615 ++ - drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.h | 215 - drivers/net/wireless/d80211/p54/Kconfig | 9 - drivers/net/wireless/d80211/p54/Makefile | 4 - drivers/net/wireless/d80211/p54/net2280.h | 452 + - drivers/net/wireless/d80211/p54/prism54.h | 77 - drivers/net/wireless/d80211/p54/prism54common.c | 816 ++ - drivers/net/wireless/d80211/p54/prism54common.h | 304 + - drivers/net/wireless/d80211/p54/prism54magic.h | 77 - drivers/net/wireless/d80211/p54/prism54pci.c | 697 ++ - drivers/net/wireless/d80211/p54/prism54pci.h | 106 - drivers/net/wireless/d80211/p54/prism54usb.c | 946 +++ - drivers/net/wireless/d80211/p54/prism54usb.h | 133 - drivers/net/wireless/d80211/rt2x00/Kconfig | 83 - drivers/net/wireless/d80211/rt2x00/Makefile | 5 - drivers/net/wireless/d80211/rt2x00/rt2400pci.c | 2985 ++++++++++ - drivers/net/wireless/d80211/rt2x00/rt2400pci.h | 967 +++ - drivers/net/wireless/d80211/rt2x00/rt2500pci.c | 3296 ++++++++++++ - drivers/net/wireless/d80211/rt2x00/rt2500pci.h | 1234 ++++ - drivers/net/wireless/d80211/rt2x00/rt2500usb.c | 3130 +++++++++++ - drivers/net/wireless/d80211/rt2x00/rt2500usb.h | 739 ++ - drivers/net/wireless/d80211/rt2x00/rt2x00.h | 1268 ++++ - drivers/net/wireless/d80211/rt2x00/rt2x00pci.h | 44 - drivers/net/wireless/d80211/rt2x00/rt2x00usb.h | 81 - drivers/net/wireless/d80211/rt2x00/rt61pci.c | 3837 +++++++++++++ - drivers/net/wireless/d80211/rt2x00/rt61pci.h | 1398 +++++ - drivers/net/wireless/d80211/rt2x00/rt73usb.c | 3477 ++++++++++++ - drivers/net/wireless/d80211/rt2x00/rt73usb.h | 980 +++ - drivers/net/wireless/d80211/zd1211rw/Kconfig | 19 - drivers/net/wireless/d80211/zd1211rw/Makefile | 11 - drivers/net/wireless/d80211/zd1211rw/zd_chip.c | 1674 ++++++ - drivers/net/wireless/d80211/zd1211rw/zd_chip.h | 909 +++ - drivers/net/wireless/d80211/zd1211rw/zd_def.h | 57 - drivers/net/wireless/d80211/zd1211rw/zd_ieee80211.h | 67 - drivers/net/wireless/d80211/zd1211rw/zd_mac.c | 713 ++ - drivers/net/wireless/d80211/zd1211rw/zd_mac.h | 251 - drivers/net/wireless/d80211/zd1211rw/zd_rf.c | 156 - drivers/net/wireless/d80211/zd1211rw/zd_rf.h | 81 - drivers/net/wireless/d80211/zd1211rw/zd_rf_al2230.c | 373 + - drivers/net/wireless/d80211/zd1211rw/zd_rf_al7230b.c | 274 - drivers/net/wireless/d80211/zd1211rw/zd_rf_rf2959.c | 279 + - drivers/net/wireless/d80211/zd1211rw/zd_usb.c | 1324 ++++ - drivers/net/wireless/d80211/zd1211rw/zd_usb.h | 241 - drivers/net/wireless/d80211/zd1211rw/zd_util.c | 82 - drivers/net/wireless/d80211/zd1211rw/zd_util.h | 29 - drivers/ssb/Kconfig | 93 - drivers/ssb/Makefile | 14 - drivers/ssb/core.c | 956 +++ - drivers/ssb/driver_chipcommon/chipcommon.c | 402 + - drivers/ssb/driver_mips/mips.c | 258 - drivers/ssb/driver_pci/pcicore.c | 556 ++ - drivers/ssb/pci.c | 667 ++ - drivers/ssb/pcihost_wrapper.c | 110 - drivers/ssb/pcmcia.c | 256 - drivers/ssb/scan.c | 426 + - drivers/ssb/ssb_private.h | 152 - drivers/usb/host/Kconfig | 10 - drivers/usb/host/ohci-hcd.c | 4 - drivers/usb/host/ohci-ssb.c | 193 - include/linux/Kbuild | 2 - include/linux/crc-itu-t.h | 27 - include/linux/eeprom_93cx6.h | 77 - include/linux/ieee80211.h | 330 + - include/linux/netdevice.h | 6 - include/linux/nl80211.h | 275 + - include/linux/ssb/ssb.h | 375 + - include/linux/ssb/ssb_driver_chipcommon.h | 387 + - include/linux/ssb/ssb_driver_extif.h | 163 - include/linux/ssb/ssb_driver_mips.h | 47 - include/linux/ssb/ssb_driver_pci.h | 108 - include/linux/ssb/ssb_regs.h | 294 + - include/net/cfg80211.h | 176 - include/net/d80211.h | 1080 +++ - include/net/iw_handler.h | 3 - include/net/wireless.h | 150 - lib/Kconfig | 16 - lib/Makefile | 3 - lib/crc-itu-t.c | 64 - lib/eeprom_93cx6.c | 344 + - net/Kconfig | 18 - net/Makefile | 2 - net/core/Makefile | 1 - net/core/dev.c | 33 - net/core/wireless.c | 2353 -------- - net/d80211/Kconfig | 73 - net/d80211/Makefile | 26 - net/d80211/aes_ccm.c | 155 - net/d80211/aes_ccm.h | 26 - net/d80211/fifo_qdisc.c | 102 - net/d80211/hostapd_ioctl.h | 434 + - net/d80211/ieee80211.c | 4940 ++++++++++++++++++ - net/d80211/ieee80211_cfg.c | 108 - net/d80211/ieee80211_cfg.h | 9 - net/d80211/ieee80211_common.h | 98 - net/d80211/ieee80211_i.h | 720 ++ - net/d80211/ieee80211_iface.c | 379 + - net/d80211/ieee80211_ioctl.c | 3294 ++++++++++++ - net/d80211/ieee80211_key.h | 89 - net/d80211/ieee80211_led.c | 91 - net/d80211/ieee80211_led.h | 32 - net/d80211/ieee80211_rate.c | 140 - net/d80211/ieee80211_rate.h | 161 - net/d80211/ieee80211_scan.c | 344 + - net/d80211/ieee80211_sta.c | 3013 ++++++++++ - net/d80211/ieee80211_sysfs.c | 716 ++ - net/d80211/ieee80211_sysfs.h | 12 - net/d80211/ieee80211_sysfs_sta.c | 438 + - net/d80211/michael.c | 104 - net/d80211/michael.h | 20 - net/d80211/rc80211_simple.c | 398 + - net/d80211/sta_info.c | 461 + - net/d80211/sta_info.h | 149 - net/d80211/tkip.c | 341 + - net/d80211/tkip.h | 36 - net/d80211/wep.c | 328 + - net/d80211/wep.h | 40 - net/d80211/wme.c | 679 ++ - net/d80211/wme.h | 38 - net/d80211/wpa.c | 846 +++ - net/d80211/wpa.h | 34 - net/wireless/Makefile | 16 - net/wireless/core.c | 276 + - net/wireless/core.h | 73 - net/wireless/nl80211.c | 1050 +++ - net/wireless/nl80211.h | 7 - net/wireless/sysfs.c | 118 - net/wireless/sysfs.h | 9 - net/wireless/wext-common.c | 663 ++ - net/wireless/wext-compat.c | 819 ++ - net/wireless/wext-export.c | 29 - net/wireless/wext-mod.c | 20 - net/wireless/wext-old.c | 1461 +++++ [...159470 lines suppressed...] ++ dev->name, MAC_ARG(addr), sta_dev->name); + -+/*------------------------------------------------------------------*/ -+/* -+ * Standard Wireless Handler : get spy threshold -+ */ -+int iw_handler_get_thrspy(struct net_device * dev, -+ struct iw_request_info *info, -+ union iwreq_data * wrqu, -+ char * extra) -+{ -+ struct iw_spy_data * spydata = get_spydata(dev); -+ struct iw_thrspy * threshold = (struct iw_thrspy *) extra; ++ sta = sta_info_add(local, dev, addr, GFP_ATOMIC); ++ if (!sta) ++ return NULL; + -+ /* Make sure driver is not buggy or using the old API */ -+ if(!spydata) -+ return -EOPNOTSUPP; ++ sta->dev = sta_dev; ++ sta->supp_rates = sdata->u.sta.supp_rates_bits; + -+ /* Just do it */ -+ memcpy(&(threshold->low), &(spydata->spy_thr_low), -+ 2 * sizeof(struct iw_quality)); ++ rate_control_rate_init(sta, local); + -+ return 0; ++ return sta; /* caller will call sta_info_put() */ +} -+EXPORT_SYMBOL(iw_handler_get_thrspy); -+ -+/*------------------------------------------------------------------*/ -+/* -+ * Prepare and send a Spy Threshold event -+ */ -+static void iw_send_thrspy_event(struct net_device * dev, -+ struct iw_spy_data * spydata, -+ unsigned char * address, -+ struct iw_quality * wstats) -+{ -+ union iwreq_data wrqu; -+ struct iw_thrspy threshold; -+ -+ /* Init */ -+ wrqu.data.length = 1; -+ wrqu.data.flags = 0; -+ /* Copy address */ -+ memcpy(threshold.addr.sa_data, address, ETH_ALEN); -+ threshold.addr.sa_family = ARPHRD_ETHER; -+ /* Copy stats */ -+ memcpy(&(threshold.qual), wstats, sizeof(struct iw_quality)); -+ /* Copy also thresholds */ -+ memcpy(&(threshold.low), &(spydata->spy_thr_low), -+ 2 * sizeof(struct iw_quality)); + -+ /* Send event to user space */ -+ wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold); -+} + -+/* ---------------------------------------------------------------- */ -+/* -+ * Call for the driver to update the spy data. -+ * For now, the spy data is a simple array. As the size of the array is -+ * small, this is good enough. If we wanted to support larger number of -+ * spy addresses, we should use something more efficient... -+ */ -+void wireless_spy_update(struct net_device * dev, -+ unsigned char * address, -+ struct iw_quality * wstats) ++int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason) +{ -+ struct iw_spy_data * spydata = get_spydata(dev); -+ int i; -+ int match = -1; ++ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); ++ struct ieee80211_if_sta *ifsta = &sdata->u.sta; + -+ /* Make sure driver is not buggy or using the old API */ -+ if(!spydata) -+ return; ++ printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n", ++ dev->name, reason); + -+ /* Update all records that match */ -+ for(i = 0; i < spydata->spy_number; i++) -+ if(!compare_ether_addr(address, spydata->spy_address[i])) { -+ memcpy(&(spydata->spy_stat[i]), wstats, -+ sizeof(struct iw_quality)); -+ match = i; -+ } ++ if (sdata->type != IEEE80211_IF_TYPE_STA && ++ sdata->type != IEEE80211_IF_TYPE_IBSS) ++ return -EINVAL; + -+ /* Generate an event if we cross the spy threshold. -+ * To avoid event storms, we have a simple hysteresis : we generate -+ * event only when we go under the low threshold or above the -+ * high threshold. */ -+ if(match >= 0) { -+ if(spydata->spy_thr_under[match]) { -+ if(wstats->level > spydata->spy_thr_high.level) { -+ spydata->spy_thr_under[match] = 0; -+ iw_send_thrspy_event(dev, spydata, -+ address, wstats); -+ } -+ } else { -+ if(wstats->level < spydata->spy_thr_low.level) { -+ spydata->spy_thr_under[match] = 1; -+ iw_send_thrspy_event(dev, spydata, -+ address, wstats); -+ } -+ } -+ } ++ ieee80211_send_deauth(dev, ifsta, reason); ++ ieee80211_set_disassoc(dev, ifsta, 1); ++ return 0; +} -+EXPORT_SYMBOL(wireless_spy_update); -diff --git a/net/wireless/wext.h b/net/wireless/wext.h -new file mode 100644 -index 0000000..ced6667 ---- /dev/null -+++ b/net/wireless/wext.h -@@ -0,0 +1,51 @@ -+/* -+ * some foo for wext compat/wext interoperability -+ */ -+#ifndef _WEXT_H -+#define _WEXT_H -+#include -+#include -+#include -+#include + -+/* wext compatibility must be compiled in... -+ * this extern is in wext-compat.c */ -+struct cfg80211_ioctl_ops { -+ /* used to make sure the module isn't going away -+ * can't really happen, except if no driver has cfg80211 -+ * in use, but in that case */ -+ struct module *module; + -+ /* and finally this is used to do work */ -+ int (*do_wext_ioctl)(struct ifreq *ifr, unsigned int cmd); -+}; -+extern struct cfg80211_ioctl_ops cfg80211_ioctl_ops; ++int ieee80211_sta_disassociate(struct net_device *dev, u16 reason) ++{ ++ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); ++ struct ieee80211_if_sta *ifsta = &sdata->u.sta; + ++ printk(KERN_DEBUG "%s: disassociate(reason=%d)\n", ++ dev->name, reason); + -+struct iw_statistics *get_wireless_stats(struct net_device *dev, -+ struct iw_statistics *out); -+int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd); ++ if (sdata->type != IEEE80211_IF_TYPE_STA) ++ return -EINVAL; + -+int cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd); -+#ifdef CFG80211_MODULE -+int call_cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd); -+#else -+#define call_cfg80211_wext_ioctl cfg80211_wext_ioctl -+#endif ++ if (!ifsta->associated) ++ return -1; + -+#if defined(CONFIG_CFG80211_WEXT_COMPAT) && defined(CFG80211_MODULE) -+int cfg80211_wext_init(void); -+void cfg80211_wext_exit(void); -+#else -+static inline int cfg80211_wext_init(void) -+{ ++ ieee80211_send_disassoc(dev, ifsta, reason); ++ ieee80211_set_disassoc(dev, ifsta, 0); + return 0; +} -+static inline void cfg80211_wext_exit(void) {} -+#endif +--- /dev/null 2006-11-15 09:57:50.578980680 -0500 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h 2007-02-27 16:16:14.000000000 -0500 +@@ -0,0 +1,9 @@ ++/* ++ * mac80211 configuration hooks for cfg80211 ++ */ ++#ifndef __IEEE80211_CFG_H ++#define __IEEE80211_CFG_H + -+extern const struct iw_ioctl_description wext_standard_ioctl[]; -+extern const unsigned wext_standard_ioctl_num; -+extern const struct iw_ioctl_description standard_event[]; -+extern const int event_type_size[]; -+#endif /* _WEXT_H */ ++extern struct cfg80211_ops mac80211_config_ops; ++ ++#endif /* __IEEE80211_CFG_H */ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2959 retrieving revision 1.2960 diff -u -r1.2959 -r1.2960 --- kernel-2.6.spec 1 Mar 2007 07:16:34 -0000 1.2959 +++ kernel-2.6.spec 1 Mar 2007 15:48:07 -0000 1.2960 @@ -2036,6 +2036,9 @@ # - tux. %changelog +* Thu Mar 1 2007 John W. Linville +- update git-wireless-dev.patch (current as of 2007-02-27) + * Thu Mar 1 2007 Dave Jones - 2.6.21rc2-git1 From fedora-cvs-commits at redhat.com Thu Mar 1 16:01:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 11:01:09 -0500 Subject: rpms/thunderbird/FC-5 firefox-1.5.0.10-nss-system-nspr.patch, NONE, 1.1 firefox-1.5.0.10-with-system-nss.patch, NONE, 1.1 firefox-1.5-pango-printing.patch, 1.3, 1.4 sources, 1.19, 1.20 thunderbird.spec, 1.75, 1.76 firefox-1.1-nss-system-nspr.patch, 1.1, NONE firefox-1.5-with-system-nss.patch, 1.1, NONE Message-ID: <200703011601.l21G19AM017386@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/thunderbird/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17367 Modified Files: firefox-1.5-pango-printing.patch sources thunderbird.spec Added Files: firefox-1.5.0.10-nss-system-nspr.patch firefox-1.5.0.10-with-system-nss.patch Removed Files: firefox-1.1-nss-system-nspr.patch firefox-1.5-with-system-nss.patch Log Message: Update to 1.5.0.10 firefox-1.5.0.10-nss-system-nspr.patch: coreconf/location.mk | 2 ++ manager/Makefile.in | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) --- NEW FILE firefox-1.5.0.10-nss-system-nspr.patch --- --- mozilla/security/coreconf/location.mk.old 2007-02-13 21:41:48.000000000 +0100 +++ mozilla/security/coreconf/location.mk 2007-02-15 16:52:03.000000000 +0100 @@ -61,6 +61,8 @@ DIST = $(SOURCE_PREFIX)/$(PLATFORM) +NSPR_LIBDIR = $(DIST)/lib + ifdef BUILD_DEBUG_GC DEFINES += -DDEBUG_GC endif --- mozilla/security/manager/Makefile.in.old 2007-02-13 21:43:11.000000000 +0100 +++ mozilla/security/manager/Makefile.in 2007-02-16 13:58:31.000000000 +0100 @@ -115,12 +115,23 @@ FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk endif +ABS_DIST := $(shell cd $(DIST) && pwd) +ifeq ($(OS_ARCH),WINNT) +ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') +endif +NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS))) +ifneq (,$(strip $(NSPR_LIBDIR))) +NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR))) +else +NSPR_LIBDIR = $(ABS_DIST)/lib +endif # NSS makefiles are not safe for parallel execution. DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 DEFAULT_GMAKE_FLAGS += CC="$(CC)" -DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" -DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist -DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist +DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)" +DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR) DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) firefox-1.5.0.10-with-system-nss.patch: aclocal.m4 | 1 build/autoconf/nss.m4 | 67 ++++++++++++++ config/autoconf.mk.in | 43 +++++++++ config/config.mk | 33 ------- configure | 129 ++++++++++++++++++++++++++++ configure.in | 18 +++ security/manager/Makefile.in | 16 +++ security/manager/ssl/src/Makefile.in | 5 + security/manager/ssl/src/nsNSSComponent.cpp | 52 ++++------- 9 files changed, 301 insertions(+), 63 deletions(-) --- NEW FILE firefox-1.5.0.10-with-system-nss.patch --- --- mozilla/configure.in.ccc 2006-08-31 17:37:23.000000000 +0200 +++ mozilla/configure.in 2007-02-22 14:42:15.000000000 +0100 @@ -86,6 +86,7 @@ MOZPNG=10207 MOZZLIB=1.2.3 NSPR_VERSION=4 +NSS_VERSION=3 dnl Set the minimum version of toolkit libs used by mozilla dnl ======================================================== @@ -3537,6 +3538,19 @@ fi fi +dnl ======================================================== +dnl = If NSS was not detected in the system, +dnl = use the one in the source tree (mozilla/security/nss) +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-nss, +[ --with-system-nss Use system installed NSS], + _USE_SYSTEM_NSS=1 ) + +if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=]) +fi + if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== @@ -6783,6 +6797,10 @@ AC_SUBST(NSPR_LIBS) AC_SUBST(MOZ_NATIVE_NSPR) +AC_SUBST(NSS_CFLAGS) +AC_SUBST(NSS_LIBS) +AC_SUBST(MOZ_NATIVE_NSS) + AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(CPPFLAGS) --- mozilla/config/autoconf.mk.in.ccc 2006-04-21 22:50:30.000000000 +0200 +++ mozilla/config/autoconf.mk.in 2007-02-22 14:42:14.000000000 +0100 @@ -231,6 +231,7 @@ MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@ MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@ +MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@ CROSS_COMPILE = @CROSS_COMPILE@ @@ -386,6 +387,48 @@ NSPR_CFLAGS = @NSPR_CFLAGS@ NSPR_LIBS = @NSPR_LIBS@ +NSS_CONFIG = @NSS_CONFIG@ +NSS_CFLAGS = @NSS_CFLAGS@ +NSS_LIBS = @NSS_LIBS@ + +ifdef MOZ_NATIVE_NSS +NSS_DEP_LIBS = \ + $(NULL) +NSS_LIBS += \ + -lcrmf \ + $(NULL) +else +NSS_DEP_LIBS = \ + $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ + $(NULL) +NSS_LIBS = \ + $(LIBS_DIR) \ + $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + -lsmime3 \ + -lssl3 \ + -lnss3 \ + -lsoftokn3 \ + $(NULL) +endif + +ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) +ifndef GNU_CC +ifndef MOZ_NATIVE_NSS +NSS_LIBS = \ + $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ + $(NULL) +endif +endif +endif + LDAP_CFLAGS = @LDAP_CFLAGS@ LDAP_LIBS = @LDAP_LIBS@ XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@ --- mozilla/config/config.mk.ccc 2006-04-06 18:28:13.000000000 +0200 +++ mozilla/config/config.mk 2007-02-22 14:42:14.000000000 +0100 @@ -138,39 +138,6 @@ FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names -# -# NSS libs needed for final link in static build -# - -NSS_LIBS = \ - $(LIBS_DIR) \ - $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ - -lnss3 \ - -lsoftokn3 \ - $(NULL) - -ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) -ifndef GNU_CC -NSS_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ - $(NULL) -endif -endif - -NSS_DEP_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ - $(NULL) - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) --- mozilla/aclocal.m4.ccc 2004-05-13 05:12:47.000000000 +0200 +++ mozilla/aclocal.m4 2007-02-22 14:42:14.000000000 +0100 @@ -8,6 +8,7 @@ builtin(include, build/autoconf/libIDL.m4)dnl builtin(include, build/autoconf/libIDL-2.m4)dnl builtin(include, build/autoconf/nspr.m4)dnl +builtin(include, build/autoconf/nss.m4)dnl builtin(include, build/autoconf/libart.m4)dnl builtin(include, build/autoconf/pkg.m4)dnl builtin(include, build/autoconf/freetype2.m4)dnl --- /dev/null 2007-02-21 10:09:45.647705500 +0100 +++ mozilla/build/autoconf/nss.m4 2007-02-22 14:42:15.000000000 +0100 @@ -0,0 +1,67 @@ +# -*- tab-width: 4; -*- +# Configure paths for NSS +# Public domain - Chris Seawood 2001-04-05 +# Based upon gtk.m4 (also PD) by Owen Taylor + +dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS +AC_DEFUN(AM_PATH_NSS, +[dnl + +AC_ARG_WITH(nss-prefix, + [ --with-nss-prefix=PFX Prefix where NSS is installed], + nss_config_prefix="$withval", + nss_config_prefix="") + +AC_ARG_WITH(nss-exec-prefix, + [ --with-nss-exec-prefix=PFX + Exec prefix where NSS is installed], + nss_config_exec_prefix="$withval", + nss_config_exec_prefix="") + + if test -n "$nss_config_exec_prefix"; then + nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config + fi + fi + if test -n "$nss_config_prefix"; then + nss_config_args="$nss_config_args --prefix=$nss_config_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_prefix/bin/nss-config + fi + fi + + unset ac_cv_path_NSS_CONFIG + AC_PATH_PROG(NSS_CONFIG, nss-config, no) + min_nss_version=ifelse([$1], ,3.0.0,$1) + AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping)) + + no_nss="" + if test "$NSS_CONFIG" = "no"; then + no_nss="yes" + else + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` + + dnl Skip version check for now + nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + fi + + if test -z "$no_nss"; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + fi + + + AC_SUBST(NSS_CFLAGS) + AC_SUBST(NSS_LIBS) + +]) --- mozilla/configure.ccc 2006-08-31 17:37:23.000000000 +0200 +++ mozilla/configure 2007-02-22 14:42:15.000000000 +0100 @@ -44,6 +44,13 @@ --with-nspr-exec-prefix=PFX Exec prefix where NSPR is installed" ac_help="$ac_help + --with-system-nss Use system installed NSS" +ac_help="$ac_help + --with-nss-prefix=PFX Prefix where NSS is installed" +ac_help="$ac_help + --with-nss-exec-prefix=PFX + Exec prefix where NSS is installed" +ac_help="$ac_help --with-system-jpeg[=PFX] Use system libjpeg [installed at prefix PFX]" ac_help="$ac_help @@ -1023,6 +1030,7 @@ MOZPNG=10207 MOZZLIB=1.2.3 NSPR_VERSION=4 +NSS_VERSION=3 GLIB_VERSION=1.2.0 GTK_VERSION=1.2.0 @@ -11399,6 +11407,123 @@ fi fi + +# Check whether --with-system-nss or --without-system-nss was given. +if test "${with_system_nss+set}" = set; then + withval="$with_system_nss" + if test "$withval" = "yes"; then + _USE_SYSTEM_NSS=1 + elif test "$withval" = "no"; then + : + else + { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; } + fi +fi + + +if test -n "$_USE_SYSTEM_NSS"; then + +# Check whether --with-nss-prefix or --without-nss-prefix was given. +if test "${with_nss_prefix+set}" = set; then + withval="$with_nss_prefix" + nss_config_prefix="$withval" +else + nss_config_prefix="" +fi + + +# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given. +if test "${with_nss_exec_prefix+set}" = set; then + withval="$with_nss_exec_prefix" + nss_config_exec_prefix="$withval" +else + nss_config_exec_prefix="" +fi + + + if test -n "$nss_config_exec_prefix"; then + nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config + fi + fi + if test -n "$nss_config_prefix"; then + nss_config_args="$nss_config_args --prefix=$nss_config_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_prefix/bin/nss-config + fi + fi + + unset ac_cv_path_NSS_CONFIG + # Extract the first word of "nss-config", so it can be a program name with args. +set dummy nss-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:11363: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$NSS_CONFIG" in + /*) + ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no" + ;; +esac +fi +NSS_CONFIG="$ac_cv_path_NSS_CONFIG" +if test -n "$NSS_CONFIG"; then + echo "$ac_t""$NSS_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +echo "configure:11398: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then + no_nss="yes" + else + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` + + nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + fi + + if test -z "$no_nss"; then + echo "$ac_t""yes" 1>&6 + MOZ_NATIVE_NSS=1 + else + echo "$ac_t""no" 1>&6 + fi + + + + + + +fi + if test -z "$SKIP_LIBRARY_CHECKS"; then # Check whether --with-system-jpeg or --without-system-jpeg was given. if test "${with_system_jpeg+set}" = set; then @@ -19598,6 +19723,9 @@ s%@NSPR_CONFIG@%$NSPR_CONFIG%g s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g s%@NSPR_LIBS@%$NSPR_LIBS%g +s%@NSS_CONFIG@%$NSS_CONFIG%g +s%@NSS_CFLAGS@%$NSS_CFLAGS%g +s%@NSS_LIBS@%$NSS_LIBS%g s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g @@ -19879,6 +20007,7 @@ s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g +s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g s%@CROSS_COMPILE@%$CROSS_COMPILE%g --- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.ccc 2005-08-26 08:41:50.000000000 +0200 +++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp 2007-02-22 14:42:15.000000000 +0100 @@ -488,14 +488,6 @@ } -#ifdef XP_MAC -#ifdef DEBUG -#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb") -#else -#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb") -#endif /*DEBUG*/ -#endif /*XP_MAC*/ - static void setOCSPOptions(nsIPrefBranch * pref); NS_IMETHODIMP @@ -689,40 +681,40 @@ const char *possible_ckbi_locations[] = { NS_GRE_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR + NS_XPCOM_CURRENT_PROCESS_DIR, + 0 }; - + for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) { nsCOMPtr mozFile; - directoryService->Get( possible_ckbi_locations[il], - NS_GET_IID(nsILocalFile), - getter_AddRefs(mozFile)); + char *fullModuleName = nsnull; + + if (!possible_ckbi_locations[il]) + { + fullModuleName = PR_GetLibraryName(nsnull, "nssckbi"); + } + else + { + directoryService->Get( possible_ckbi_locations[il], + NS_GET_IID(nsILocalFile), + getter_AddRefs(mozFile)); - if (!mozFile) { - continue; + if (!mozFile) { + continue; + } + + nsCAutoString processDir; + mozFile->GetNativePath(processDir); + fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); } - char *fullModuleName = nsnull; -#ifdef XP_MAC - nsCAutoString nativePath; - mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files")); - mozFile->AppendNative(LOADABLE_CERTS_MODULE); - mozFile->GetNativePath(nativePath); - fullModuleName = (char *) nativePath.get(); -#else - nsCAutoString processDir; - mozFile->GetNativePath(processDir); - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); -#endif /* If a module exists with the same name, delete it. */ NS_ConvertUCS2toUTF8 modNameUTF8(modName); int modType; SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType); SECStatus rv_add = SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0); -#ifndef XP_MAC - PR_Free(fullModuleName); // allocated by NSPR -#endif + PR_FreeLibraryName(fullModuleName); // allocated by NSPR if (SECSuccess == rv_add) { // found a module, no need to try other directories break; --- mozilla/security/manager/ssl/src/Makefile.in.ccc 2005-08-03 07:24:18.000000000 +0200 +++ mozilla/security/manager/ssl/src/Makefile.in 2007-02-22 14:42:15.000000000 +0100 @@ -123,8 +123,13 @@ # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's +ifdef MOZ_NATIVE_NSS +LOCAL_INCLUDES += $(NSS_CFLAGS) \ + $(NULL) +else LOCAL_INCLUDES += -I$(DIST)/public/nss \ $(NULL) +endif EXTRA_DSO_LDOPTS += \ $(MOZ_UNICHARUTIL_LIBS) \ --- mozilla/security/manager/Makefile.in.ccc 2007-02-22 14:42:14.000000000 +0100 +++ mozilla/security/manager/Makefile.in 2007-02-22 14:45:44.000000000 +0100 @@ -46,6 +46,8 @@ MODULE = psm PACKAGE_FILE = psm.pkg + +ifndef MOZ_NATIVE_NSS PACKAGE_VARS += \ NSS3_LIB \ SMIME3_LIB \ @@ -60,6 +62,7 @@ $(NULL) LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) +endif NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) @@ -200,6 +203,7 @@ export:: .nss.cleaned .nss.cleaned: .nss.checkout +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean ifndef SKIP_CHK @@ -207,9 +211,12 @@ $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean endif touch $@ +endif .nss.checkout: +ifndef MOZ_NATIVE_NSS touch $(srcdir)/$@ +endif dependclean export packages chrome:: $(MAKE) -C boot $@ @@ -220,12 +227,15 @@ endif libs:: +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) +endif ifeq ($(OS_ARCH),WINNT) cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) else cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) endif +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) @@ -307,6 +317,7 @@ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin endif endif +endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C locales $@ @@ -315,6 +326,7 @@ endif install:: +ifndef MOZ_NATIVE_NSS $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) ifndef SKIP_CHK $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) @@ -351,6 +363,7 @@ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) endif +endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C locales $@ @@ -365,15 +378,18 @@ ifdef MOZ_XUL $(MAKE) -C pki $@ endif +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean endif +endif echo-requires-recursive:: $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C pki $@ $(MAKE) -C locales $@ + firefox-1.5-pango-printing.patch: config/system-headers | 3 gfx/src/freetype/nsFreeType.cpp | 18 gfx/src/freetype/nsFreeType.h | 7 gfx/src/gtk/mozilla-decoder.cpp | 71 +- gfx/src/gtk/mozilla-decoder.h | 28 gfx/src/gtk/nsDeviceContextGTK.cpp | 4 gfx/src/gtk/nsFontMetricsPango.cpp | 1226 ++++++++++++++++++++++++------------ gfx/src/gtk/nsFontMetricsPango.h | 160 +++- gfx/src/gtk/nsFontMetricsUtils.cpp | 21 gfx/src/ps/Makefile.in | 12 gfx/src/ps/nsDeviceContextPS.cpp | 56 + gfx/src/ps/nsFontMetricsPS.cpp | 305 ++++++++ gfx/src/ps/nsFontMetricsPS.h | 68 + gfx/src/ps/nsPostScriptObj.cpp | 124 +++ gfx/src/ps/nsPostScriptObj.h | 32 gfx/src/ps/nsRenderingContextPS.cpp | 206 ------ gfx/src/ps/nsRenderingContextPS.h | 11 gfx/src/ps/nsType1.cpp | 261 +++++-- gfx/src/ps/nsType1.h | 3 19 files changed, 1787 insertions(+), 829 deletions(-) Index: firefox-1.5-pango-printing.patch =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-5/firefox-1.5-pango-printing.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- firefox-1.5-pango-printing.patch 2 Jan 2007 17:01:21 -0000 1.3 +++ firefox-1.5-pango-printing.patch 1 Mar 2007 16:01:06 -0000 1.4 @@ -2904,17 +2904,6 @@ } #ifdef MOZ_ENABLE_XFT -@@ -2336,8 +2589,8 @@ - - nsXftType1Generator::~nsXftType1Generator() - { -- if (mEntry->mFace) -- FT_Done_Face(mEntry->mFace); -+ if (mEntry->mFace) -+ FT_Done_Face(mEntry->mFace); - - if (FT_Done_FreeType(mFreeTypeLibrary)) - return; @@ -2357,8 +2610,8 @@ } Index: sources =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 20 Dec 2006 22:17:54 -0000 1.19 +++ sources 1 Mar 2007 16:01:06 -0000 1.20 @@ -1,2 +1,2 @@ -bb74629a8d99a6653c5ab978cf9c6227 thunderbird-1.5.0.9-source.tar.bz2 -f38fb250f9c6946912af14930c2cc8e3 thunderbird-langpacks-1.5.0.9-20061215.tar.bz2 +65087f8a7adb0773ae7198ec21cc2975 thunderbird-1.5.0.10-source.tar.bz2 +0ac9a4a17d12422858c07fe553ee9ac2 thunderbird-langpacks-1.5.0.10-20070301.tar.bz2 Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-5/thunderbird.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- thunderbird.spec 20 Dec 2006 22:17:54 -0000 1.75 +++ thunderbird.spec 1 Mar 2007 16:01:06 -0000 1.76 @@ -7,8 +7,8 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 1.5.0.9 -Release: 2%{?dist} +Version: 1.5.0.10 +Release: 1%{?dist} Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -19,7 +19,7 @@ %define tarball thunderbird-1.5rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20061215.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20070301.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -31,9 +31,9 @@ # Build patches Patch2: firefox-1.0-prdtoa.patch -Patch4: firefox-1.5-with-system-nss.patch +Patch4: firefox-1.5.0.10-with-system-nss.patch Patch5: thunderbird-1.5-visibility.patch -Patch6: firefox-1.1-nss-system-nspr.patch +Patch6: firefox-1.5.0.10-nss-system-nspr.patch Patch10: thunderbird-0.7.3-psfonts.patch Patch11: thunderbird-0.7.3-gnome-uriloader.patch @@ -268,6 +268,9 @@ #=============================================================================== %changelog +* Tue Mar 1 2007 Martin Stransky 1.5.0.10-1 +- Update to 1.5.0.10 + * Tue Dec 19 2006 Matthias Clasen 1.5.0.9-2 - Add a Requires: launchmail (#219884) --- firefox-1.1-nss-system-nspr.patch DELETED --- --- firefox-1.5-with-system-nss.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 1 16:10:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 11:10:38 -0500 Subject: rpms/lsof/devel lsof.spec,1.35,1.36 Message-ID: <200703011610.l21GAcrq017664@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/lsof/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17649 Modified Files: lsof.spec Log Message: * Thu Mar 1 2007 Karel Zak 4.78-4 - fix #226108 - Merge Review: lsof Index: lsof.spec =================================================================== RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- lsof.spec 9 Aug 2006 22:21:13 -0000 1.35 +++ lsof.spec 1 Mar 2007 16:10:36 -0000 1.36 @@ -1,14 +1,13 @@ -Summary: A utility which lists open files on a Linux/UNIX system. +Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.78 -Release: 3 +Release: 4%{?dist} License: Free -%define lsofrh lsof_4.78C-rh Group: Development/Debuggers - +%define lsofrh lsof_4.78C-rh Source0: %{lsofrh}.tar.bz2 -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-root +URL: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel @@ -21,20 +20,19 @@ %prep %setup -q -n %{lsofrh} - %patch1 -p1 %build LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux -make DEBUG="$RPM_OPT_FLAGS" +make DEBUG="$RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} -install -m 0755 lsof ${RPM_BUILD_ROOT}%{_prefix}/sbin +install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_prefix}/sbin mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 -install lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ +install -p lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ %clean rm -rf ${RPM_BUILD_ROOT} @@ -46,6 +44,9 @@ %{_mandir}/man*/* %changelog +* Thu Mar 1 2007 Karel Zak 4.78-4 +- fix #226108 - Merge Review: lsof + * Thu Aug 10 2006 Karel Zak 4.78-3 - minor changes to thread patch @@ -205,4 +206,4 @@ * Tue Apr 28 1998 Maciej Lesniewski - Built under RH5 -- %install was changed +- install macro was changed From fedora-cvs-commits at redhat.com Thu Mar 1 16:24:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 11:24:26 -0500 Subject: rpms/rhpl/devel .cvsignore, 1.76, 1.77 rhpl.spec, 1.94, 1.95 sources, 1.83, 1.84 Message-ID: <200703011624.l21GOQQl011125@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/rhpl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11097/devel Modified Files: .cvsignore rhpl.spec sources Log Message: auto-import rhpl-0.203-1 on branch devel from rhpl-0.203-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- .cvsignore 28 Feb 2007 21:16:16 -0000 1.76 +++ .cvsignore 1 Mar 2007 16:24:22 -0000 1.77 @@ -1,5 +1 @@ -rhpl-0.198.tar.gz -rhpl-0.199.tar.gz -rhpl-0.200.tar.gz -rhpl-0.201.tar.gz -rhpl-0.202.tar.gz +rhpl-0.203.tar.gz Index: rhpl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- rhpl.spec 28 Feb 2007 21:16:17 -0000 1.94 +++ rhpl.spec 1 Mar 2007 16:24:22 -0000 1.95 @@ -1,6 +1,6 @@ Summary: Library of python code used by programs in Red Hat Linux Name: rhpl -Version: 0.202 +Version: 0.203 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -38,6 +38,9 @@ %{_libdir}/python?.?/site-packages/rhpl %changelog +* Thu Mar 1 2007 Jeremy Katz - 0.203-1 +- Fix pSeries detection (Jerone Young, #229231) + * Wed Feb 28 2007 Chris Lumens - 0.202-1 - Replace deprecated exceptions with real classes (#220802). Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/sources,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- sources 28 Feb 2007 21:16:17 -0000 1.83 +++ sources 1 Mar 2007 16:24:22 -0000 1.84 @@ -1 +1 @@ -2a449d7594c8098979325b9ab9764cc4 rhpl-0.202.tar.gz +50c43612ac85e6a8f68e99be7968e03a rhpl-0.203.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 1 16:30:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 11:30:22 -0500 Subject: rpms/selinux-policy/devel modules-strict.conf, 1.20, 1.21 modules-targeted.conf, 1.48, 1.49 policy-20070219.patch, 1.10, 1.11 selinux-policy.spec, 1.403, 1.404 Message-ID: <200703011630.l21GUMkB011362@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11337 Modified Files: modules-strict.conf modules-targeted.conf policy-20070219.patch selinux-policy.spec Log Message: * Thu Mar 1 2007 Dan Walsh 2.5.7-1 - Update to latest from upstream - Add fail2ban policy Index: modules-strict.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- modules-strict.conf 28 Feb 2007 21:22:01 -0000 1.20 +++ modules-strict.conf 1 Mar 2007 16:30:20 -0000 1.21 @@ -1333,3 +1333,10 @@ # Policy for sendmail. # qmail = module + +# Layer: services +# Module: fail2ban +# +# daiemon that bans IP that makes too many password failures +# +fail2ban = module Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- modules-targeted.conf 28 Feb 2007 21:22:01 -0000 1.48 +++ modules-targeted.conf 1 Mar 2007 16:30:20 -0000 1.49 @@ -1208,3 +1208,10 @@ # games = module +# Layer: services +# Module: fail2ban +# +# daiemon that bans IP that makes too many password failures +# +fail2ban = module + policy-20070219.patch: Rules.modular | 10 + policy/flask/access_vectors | 4 policy/global_booleans | 2 policy/global_tunables | 65 +++++++ policy/mls | 31 ++- policy/modules/admin/acct.te | 1 policy/modules/admin/consoletype.te | 8 policy/modules/admin/dmesg.te | 1 policy/modules/admin/kudzu.te | 3 policy/modules/admin/netutils.te | 3 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 44 +++++ policy/modules/admin/rpm.te | 2 policy/modules/admin/su.if | 6 policy/modules/admin/sudo.if | 5 policy/modules/admin/sudo.te | 1 policy/modules/admin/usermanage.te | 20 ++ policy/modules/apps/gnome.if | 25 ++- policy/modules/apps/gpg.fc | 2 policy/modules/apps/gpg.if | 1 policy/modules/apps/loadkeys.if | 44 +---- policy/modules/apps/mozilla.if | 1 policy/modules/kernel/corecommands.if | 48 +++++ policy/modules/kernel/corenetwork.if.in | 78 ++++++++- policy/modules/kernel/corenetwork.te.in | 15 + policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.if | 36 ++++ policy/modules/kernel/domain.if | 18 ++ policy/modules/kernel/domain.te | 22 ++ policy/modules/kernel/files.if | 63 +++++++ policy/modules/kernel/filesystem.if | 20 ++ policy/modules/kernel/kernel.if | 23 ++ policy/modules/kernel/kernel.te | 2 policy/modules/kernel/mls.if | 20 ++ policy/modules/kernel/mls.te | 3 policy/modules/kernel/selinux.if | 38 ++++ 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 | 23 ++ policy/modules/services/apache.if | 158 +++++++++++++++++++ policy/modules/services/apache.te | 18 ++ policy/modules/services/automount.te | 1 policy/modules/services/ccs.te | 1 policy/modules/services/consolekit.fc | 2 policy/modules/services/consolekit.if | 46 +++++ policy/modules/services/consolekit.te | 62 +++++++ policy/modules/services/cpucontrol.te | 1 policy/modules/services/cron.fc | 1 policy/modules/services/cron.if | 33 +--- policy/modules/services/cron.te | 43 ++++- policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 58 +++++++ policy/modules/services/dhcp.te | 2 policy/modules/services/fail2ban.fc | 4 policy/modules/services/fail2ban.if | 87 ++++++++++ policy/modules/services/fail2ban.te | 77 +++++++++ policy/modules/services/ftp.te | 5 policy/modules/services/hal.fc | 6 policy/modules/services/hal.te | 93 +++++++++++ policy/modules/services/inetd.te | 5 policy/modules/services/mta.te | 2 policy/modules/services/nis.if | 4 policy/modules/services/nscd.if | 20 ++ policy/modules/services/nscd.te | 3 policy/modules/services/pegasus.if | 27 +++ policy/modules/services/pegasus.te | 5 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.te | 3 policy/modules/services/procmail.te | 13 + policy/modules/services/pyzor.if | 22 ++ policy/modules/services/pyzor.te | 9 + policy/modules/services/ricci.te | 10 - policy/modules/services/rpc.te | 26 ++- policy/modules/services/rsync.te | 1 policy/modules/services/samba.if | 21 ++ policy/modules/services/samba.te | 6 policy/modules/services/setroubleshoot.te | 4 policy/modules/services/smartmon.te | 1 policy/modules/services/spamassassin.fc | 1 policy/modules/services/spamassassin.if | 41 +++++ policy/modules/services/spamassassin.te | 15 + policy/modules/services/squid.fc | 1 policy/modules/services/squid.if | 2 policy/modules/services/squid.te | 12 + policy/modules/services/ssh.fc | 2 policy/modules/services/ssh.if | 39 ++++ policy/modules/services/ssh.te | 5 policy/modules/services/xserver.if | 2 policy/modules/services/xserver.te | 4 policy/modules/system/application.fc | 1 policy/modules/system/application.if | 41 +++++ policy/modules/system/application.te | 6 policy/modules/system/authlogin.if | 87 ++++++++-- policy/modules/system/authlogin.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.te | 14 + policy/modules/system/init.if | 62 +++++++ policy/modules/system/init.te | 26 ++- policy/modules/system/ipsec.if | 100 ++++++++++++ policy/modules/system/iptables.te | 9 - policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 8 policy/modules/system/lvm.if | 23 ++ policy/modules/system/lvm.te | 17 +- policy/modules/system/modutils.te | 3 policy/modules/system/mount.te | 10 - policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 119 ++++++++++++++ policy/modules/system/selinuxutil.te | 127 ++++----------- policy/modules/system/unconfined.fc | 1 policy/modules/system/unconfined.te | 15 + policy/modules/system/userdomain.if | 244 ++++++++++++++++-------------- policy/modules/system/userdomain.te | 38 +++- policy/modules/system/xen.te | 26 +++ policy/support/obj_perm_sets.spt | 2 119 files changed, 2325 insertions(+), 377 deletions(-) Index: policy-20070219.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- policy-20070219.patch 28 Feb 2007 21:22:01 -0000 1.10 +++ policy-20070219.patch 1 Mar 2007 16:30:20 -0000 1.11 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.6/policy/flask/access_vectors +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.7/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2007-02-26 09:43:33.000000000 -0500 -+++ serefpolicy-2.5.6/policy/flask/access_vectors 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/flask/access_vectors 2007-03-01 10:20:27.000000000 -0500 @@ -598,6 +598,8 @@ shmempwd shmemgrp @@ -19,9 +19,9 @@ } class key -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.6/policy/global_booleans +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.7/policy/global_booleans --- nsaserefpolicy/policy/global_booleans 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.6/policy/global_booleans 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/global_booleans 2007-03-01 10:20:27.000000000 -0500 @@ -4,7 +4,6 @@ # file should be used. # @@ -38,9 +38,9 @@ ## ##

-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.6/policy/global_tunables +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.7/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.6/policy/global_tunables 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/global_tunables 2007-03-01 10:20:27.000000000 -0500 @@ -162,7 +162,6 @@ ## gen_tunable(allow_smbd_anon_write,false) @@ -152,9 +152,9 @@ +## +gen_tunable(allow_ipsec_label,true) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.6/policy/mls +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.7/policy/mls --- nsaserefpolicy/policy/mls 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.6/policy/mls 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/mls 2007-03-01 10:20:27.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 @@ -226,9 +226,9 @@ ( t2 == unlabeled_t )); mlsconstrain association { polmatch } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.6/policy/modules/admin/acct.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.7/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/acct.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/acct.te 2007-03-01 10:20:27.000000000 -0500 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -237,9 +237,9 @@ type acct_data_t; logging_log_file(acct_data_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.6/policy/modules/admin/consoletype.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.7/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/consoletype.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/consoletype.te 2007-03-01 10:20:27.000000000 -0500 @@ -8,7 +8,12 @@ type consoletype_t; @@ -262,9 +262,9 @@ ######################################## # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.5.6/policy/modules/admin/dmesg.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.5.7/policy/modules/admin/dmesg.te --- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/dmesg.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/dmesg.te 2007-03-01 10:20:27.000000000 -0500 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -273,9 +273,9 @@ role system_r types dmesg_t; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.5.6/policy/modules/admin/kudzu.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.5.7/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/kudzu.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/kudzu.te 2007-03-01 10:20:27.000000000 -0500 @@ -103,6 +103,9 @@ init_use_fds(kudzu_t) init_use_script_ptys(kudzu_t) @@ -286,9 +286,9 @@ libs_use_ld_so(kudzu_t) libs_use_shared_libs(kudzu_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.5.6/policy/modules/admin/netutils.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.5.7/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/netutils.te 2007-02-28 16:00:02.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/netutils.te 2007-03-01 10:20:27.000000000 -0500 @@ -22,6 +22,7 @@ type traceroute_t; type traceroute_exec_t; @@ -306,9 +306,9 @@ kernel_search_proc(netutils_t) corenet_non_ipsec_sendrecv(netutils_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.5.6/policy/modules/admin/rpm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.5.7/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/rpm.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/rpm.fc 2007-03-01 10:20:27.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) @@ -319,9 +319,9 @@ ') /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.6/policy/modules/admin/rpm.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.5.7/policy/modules/admin/rpm.if --- nsaserefpolicy/policy/modules/admin/rpm.if 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/rpm.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/rpm.if 2007-03-01 10:20:27.000000000 -0500 @@ -270,3 +270,47 @@ dontaudit $1 rpm_var_lib_t:file manage_file_perms; dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms; @@ -370,9 +370,9 @@ + dontaudit $1 rpm_tmp_t:file rw_file_perms; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.5.6/policy/modules/admin/rpm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.5.7/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/rpm.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/rpm.te 2007-03-01 10:20:27.000000000 -0500 @@ -9,6 +9,8 @@ type rpm_t; type rpm_exec_t; @@ -382,9 +382,9 @@ domain_obj_id_change_exemption(rpm_t) domain_role_change_exemption(rpm_t) domain_system_change_exemption(rpm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.5.6/policy/modules/admin/sudo.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.5.7/policy/modules/admin/sudo.if --- nsaserefpolicy/policy/modules/admin/sudo.if 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/sudo.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/sudo.if 2007-03-01 10:20:27.000000000 -0500 @@ -37,7 +37,6 @@ gen_require(` @@ -407,9 +407,9 @@ domain_use_interactive_fds($1_sudo_t) domain_sigchld_interactive_fds($1_sudo_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.te serefpolicy-2.5.6/policy/modules/admin/sudo.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.te serefpolicy-2.5.7/policy/modules/admin/sudo.te --- nsaserefpolicy/policy/modules/admin/sudo.te 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/sudo.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/sudo.te 2007-03-01 10:20:27.000000000 -0500 @@ -7,5 +7,6 @@ type sudo_exec_t; @@ -417,9 +417,9 @@ +application_executable_file(sudo_exec_t) # Remaining policy in per user domain template. -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.5.6/policy/modules/admin/su.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.5.7/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/su.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/su.if 2007-03-01 10:20:27.000000000 -0500 @@ -71,7 +71,7 @@ files_search_var_lib($1_su_t) files_dontaudit_getattr_tmp_dirs($1_su_t) @@ -447,9 +447,9 @@ ifdef(`TODO',` allow $1_su_t $1_home_t:file manage_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.5.6/policy/modules/admin/usermanage.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.5.7/policy/modules/admin/usermanage.te --- nsaserefpolicy/policy/modules/admin/usermanage.te 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/admin/usermanage.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/usermanage.te 2007-03-01 10:20:27.000000000 -0500 @@ -263,6 +263,7 @@ optional_policy(` rpm_use_fds(groupadd_t) @@ -505,9 +505,9 @@ rpm_rw_pipes(useradd_t) + rpm_dontaudit_rw_tmp_files(useradd_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-2.5.6/policy/modules/apps/gnome.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-2.5.7/policy/modules/apps/gnome.if --- nsaserefpolicy/policy/modules/apps/gnome.if 2007-02-19 11:32:52.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/apps/gnome.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/gnome.if 2007-03-01 10:20:27.000000000 -0500 @@ -105,6 +105,10 @@ ') @@ -553,9 +553,9 @@ ##

##

## This is a templated interface, and should only -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-2.5.6/policy/modules/apps/gpg.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-2.5.7/policy/modules/apps/gpg.fc --- nsaserefpolicy/policy/modules/apps/gpg.fc 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/apps/gpg.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/gpg.fc 2007-03-01 10:20:27.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) @@ -563,9 +563,9 @@ -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.6/policy/modules/apps/gpg.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-2.5.7/policy/modules/apps/gpg.if --- nsaserefpolicy/policy/modules/apps/gpg.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/apps/gpg.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/gpg.if 2007-03-01 10:20:27.000000000 -0500 @@ -89,6 +89,7 @@ manage_files_pattern($1_gpg_t,$1_gpg_secret_t,$1_gpg_secret_t) @@ -574,21 +574,9 @@ # transition from the userdomain to the derived domain 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.6/policy/modules/apps/java.fc ---- nsaserefpolicy/policy/modules/apps/java.fc 2007-01-25 08:13:58.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/apps/java.fc 2007-02-28 14:54:34.000000000 -0500 -@@ -18,3 +18,8 @@ - /usr/bin/grmic -- gen_context(system_u:object_r:java_exec_t,s0) - /usr/bin/grmiregistry -- gen_context(system_u:object_r:java_exec_t,s0) - /usr/bin/jv-convert -- gen_context(system_u:object_r:java_exec_t,s0) -+# MATLAB Policy -+/usr/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0) -+/usr/local/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0) -+/opt/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0) -+/opt/local/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.if serefpolicy-2.5.6/policy/modules/apps/loadkeys.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.if serefpolicy-2.5.7/policy/modules/apps/loadkeys.if --- nsaserefpolicy/policy/modules/apps/loadkeys.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/apps/loadkeys.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/loadkeys.if 2007-03-01 10:20:27.000000000 -0500 @@ -11,16 +11,12 @@ ## # @@ -655,9 +643,9 @@ ') + can_exec($1,loadkeys_exec_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.5.6/policy/modules/apps/mozilla.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.5.7/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-02-19 11:32:52.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/apps/mozilla.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/mozilla.if 2007-03-01 10:20:27.000000000 -0500 @@ -147,6 +147,7 @@ corenet_dontaudit_tcp_bind_generic_port($1_mozilla_t) @@ -666,28 +654,9 @@ dev_write_sound($1_mozilla_t) dev_read_sound($1_mozilla_t) dev_dontaudit_rw_dri($1_mozilla_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.5.6/policy/modules/kernel/corecommands.fc ---- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/corecommands.fc 2007-02-28 14:54:34.000000000 -0500 -@@ -73,7 +73,6 @@ - - ifdef(`targeted_policy',` - /etc/X11/prefdm -- gen_context(system_u:object_r:bin_t,s0) --/usr/games/nethack-3.4.3/nethack -- gen_context(system_u:object_r:bin_t,s0) - ') - - # -@@ -254,3 +253,7 @@ - ifdef(`distro_suse',` - /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) - ') -+ -+/etc/security/namespace.init -- gen_context(system_u:object_r:bin_t,s0) -+ -+/usr/lib/bluetooth(/.*)? -- gen_context(system_u:object_r:bin_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.5.6/policy/modules/kernel/corecommands.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.5.7/policy/modules/kernel/corecommands.if --- nsaserefpolicy/policy/modules/kernel/corecommands.if 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/corecommands.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/corecommands.if 2007-03-01 10:20:27.000000000 -0500 @@ -928,7 +928,15 @@ type bin_t, sbin_t; ') @@ -747,9 +716,9 @@ +') + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.5.6/policy/modules/kernel/corenetwork.if.in +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.5.7/policy/modules/kernel/corenetwork.if.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/corenetwork.if.in 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/corenetwork.if.in 2007-03-01 10:20:27.000000000 -0500 @@ -1034,10 +1034,10 @@ # interface(`corenet_tcp_sendrecv_reserved_port',` @@ -886,9 +855,9 @@ + + typeattribute $1 rpc_port_type; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.5.6/policy/modules/kernel/corenetwork.te.in +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/corenetwork.te.in 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.in 2007-03-01 10:20:27.000000000 -0500 @@ -43,11 +43,16 @@ sid port gen_context(system_u:object_r:port_t,s0) @@ -929,9 +898,9 @@ ######################################## # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.m4 serefpolicy-2.5.6/policy/modules/kernel/corenetwork.te.m4 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.m4 serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.m4 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.m4 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/corenetwork.te.m4 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.m4 2007-03-01 10:20:27.000000000 -0500 @@ -55,8 +55,8 @@ define(`declare_ports',`dnl ifelse(eval($3 < 1024),1,` @@ -943,32 +912,9 @@ ',`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.6/policy/modules/kernel/devices.fc ---- nsaserefpolicy/policy/modules/kernel/devices.fc 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/devices.fc 2007-02-28 14:54:34.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) -@@ -58,6 +60,7 @@ - /dev/srnd[0-7] -c gen_context(system_u:object_r:sound_device_t,s0) - /dev/snapshot -c gen_context(system_u:object_r:apm_bios_t,s0) - /dev/sndstat -c gen_context(system_u:object_r:sound_device_t,s0) -+/dev/sonypi -c gen_context(system_u:object_r:v4l_device_t,s0) - /dev/tlk[0-3] -c gen_context(system_u:object_r:v4l_device_t,s0) - /dev/urandom -c gen_context(system_u:object_r:urandom_device_t,s0) - /dev/usbdev.* -c gen_context(system_u:object_r:usb_device_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.5.6/policy/modules/kernel/devices.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.5.7/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/devices.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/devices.if 2007-03-01 10:20:27.000000000 -0500 @@ -2449,6 +2449,24 @@ ######################################## @@ -1016,9 +962,9 @@ + + allow $1 device_t:dir delete_dir_perms; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.5.6/policy/modules/kernel/domain.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.5.7/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/domain.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/domain.if 2007-03-01 10:20:27.000000000 -0500 @@ -1254,3 +1254,21 @@ typeattribute $1 can_change_object_identity; typeattribute $1 set_curr_context; @@ -1041,9 +987,9 @@ + + allow $1 domain:association { sendto recvfrom }; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.5.6/policy/modules/kernel/domain.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.5.7/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/domain.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/domain.te 2007-03-01 10:20:27.000000000 -0500 @@ -144,3 +144,25 @@ # act on all domains keys @@ -1070,9 +1016,9 @@ + ipsec_labeled(domain) + ') +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.5.6/policy/modules/kernel/files.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.5.7/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2007-02-26 14:17:21.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/files.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/files.if 2007-03-01 10:20:27.000000000 -0500 @@ -110,7 +110,14 @@ ## # @@ -1188,9 +1134,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.5.6/policy/modules/kernel/filesystem.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.5.7/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/filesystem.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/filesystem.if 2007-03-01 10:20:27.000000000 -0500 @@ -1110,11 +1110,31 @@ type dosfs_t; ') @@ -1223,9 +1169,9 @@ ## Read eventpollfs files. ## ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.5.6/policy/modules/kernel/kernel.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.5.7/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/kernel.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/kernel.if 2007-03-01 10:20:27.000000000 -0500 @@ -1830,6 +1830,26 @@ ######################################## @@ -1263,9 +1209,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.5.6/policy/modules/kernel/kernel.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.5.7/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/kernel.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/kernel.te 2007-03-01 10:20:27.000000000 -0500 @@ -138,6 +138,8 @@ type unlabeled_t; sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) @@ -1275,9 +1221,9 @@ # These initial sids are no longer used, and can be removed: sid any_socket gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) sid file_labels gen_context(system_u:object_r:unlabeled_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.5.6/policy/modules/kernel/mls.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.5.7/policy/modules/kernel/mls.if --- nsaserefpolicy/policy/modules/kernel/mls.if 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/mls.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/mls.if 2007-03-01 10:20:27.000000000 -0500 @@ -154,6 +154,26 @@ ######################################## ##

@@ -1305,9 +1251,9 @@ ## for writing to sockets at any level. ## ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.5.6/policy/modules/kernel/mls.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.5.7/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/mls.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/mls.te 2007-03-01 10:20:27.000000000 -0500 @@ -18,6 +18,7 @@ attribute mlsnetreadtoclr; attribute mlsnetwrite; @@ -1325,9 +1271,9 @@ attribute mlstrustedobject; attribute privrangetrans; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.5.6/policy/modules/kernel/selinux.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.5.7/policy/modules/kernel/selinux.if --- nsaserefpolicy/policy/modules/kernel/selinux.if 2007-02-27 14:37:10.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/selinux.if 2007-02-28 15:57:10.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/selinux.if 2007-03-01 10:20:27.000000000 -0500 @@ -51,6 +51,44 @@ ######################################## @@ -1373,9 +1319,9 @@ ## Search selinuxfs. ## ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.5.6/policy/modules/kernel/storage.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.5.7/policy/modules/kernel/storage.fc --- nsaserefpolicy/policy/modules/kernel/storage.fc 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/storage.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/storage.fc 2007-03-01 10:20:27.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) @@ -1384,9 +1330,9 @@ /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.6/policy/modules/kernel/storage.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-2.5.7/policy/modules/kernel/storage.if --- nsaserefpolicy/policy/modules/kernel/storage.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/storage.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/storage.if 2007-03-01 10:20:27.000000000 -0500 @@ -100,6 +100,7 @@ dev_list_all_dev_nodes($1) @@ -1403,9 +1349,9 @@ typeattribute $1 fixed_disk_raw_write; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.5.6/policy/modules/kernel/terminal.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.5.7/policy/modules/kernel/terminal.if --- nsaserefpolicy/policy/modules/kernel/terminal.if 2007-02-20 16:35:52.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/terminal.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/terminal.if 2007-03-01 10:20:27.000000000 -0500 @@ -1052,7 +1052,7 @@ ') @@ -1415,9 +1361,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-2.5.6/policy/modules/kernel/terminal.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-2.5.7/policy/modules/kernel/terminal.te --- nsaserefpolicy/policy/modules/kernel/terminal.te 2007-02-20 16:35:52.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/kernel/terminal.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/terminal.te 2007-03-01 10:20:27.000000000 -0500 @@ -28,6 +28,7 @@ type devpts_t; files_mountpoint(devpts_t) @@ -1426,9 +1372,9 @@ fs_type(devpts_t) fs_use_trans devpts gen_context(system_u:object_r:devpts_t,s0); -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.5.6/policy/modules/services/apache.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.5.7/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/apache.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/apache.fc 2007-03-01 10:20:27.000000000 -0500 @@ -1,10 +1,5 @@ # temporary hack till genhomedircon is fixed -ifdef(`targeted_policy',` @@ -1474,9 +1420,9 @@ +/usr/share/bugzilla(/.*)? -d gen_context(system_u:object_r:httpd_bugzilla_content_t,s0) +/usr/share/bugzilla(/.*)? -- gen_context(system_u:object_r:httpd_bugzilla_script_exec_t,s0) +/var/lib/bugzilla(/.*)? gen_context(system_u:object_r:httpd_bugzilla_script_rw_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.5.6/policy/modules/services/apache.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.5.7/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/apache.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/apache.if 2007-03-01 10:20:27.000000000 -0500 @@ -268,6 +268,9 @@ ') @@ -1660,9 +1606,9 @@ + + allow $1 httpd_bugzilla_content_t:dir search_dir_perms; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.5.6/policy/modules/services/apache.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.5.7/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/apache.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/apache.te 2007-03-01 10:20:27.000000000 -0500 @@ -171,6 +171,7 @@ allow httpd_t httpd_modules_t:dir list_dir_perms; mmap_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) @@ -1699,9 +1645,9 @@ + postgresql_stream_connect(httpd_bugzilla_script_t) +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.5.6/policy/modules/services/automount.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.5.7/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/automount.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/automount.te 2007-03-01 10:20:27.000000000 -0500 @@ -69,6 +69,7 @@ files_mounton_all_mountpoints(automount_t) files_mount_all_file_type_fs(automount_t) @@ -1710,9 +1656,9 @@ fs_mount_all_fs(automount_t) fs_unmount_all_fs(automount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.5.6/policy/modules/services/ccs.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.5.7/policy/modules/services/ccs.te --- nsaserefpolicy/policy/modules/services/ccs.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/ccs.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ccs.te 2007-03-01 10:20:27.000000000 -0500 @@ -33,6 +33,7 @@ allow ccs_t self:capability { ipc_lock sys_nice sys_resource sys_admin }; @@ -1721,15 +1667,15 @@ 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; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-2.5.6/policy/modules/services/consolekit.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-2.5.7/policy/modules/services/consolekit.fc --- nsaserefpolicy/policy/modules/services/consolekit.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/consolekit.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/consolekit.fc 2007-03-01 10:20:27.000000000 -0500 @@ -0,0 +1,2 @@ + +/usr/sbin/console-kit-daemon -- gen_context(system_u:object_r:consolekit_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-2.5.6/policy/modules/services/consolekit.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-2.5.7/policy/modules/services/consolekit.if --- nsaserefpolicy/policy/modules/services/consolekit.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/consolekit.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/consolekit.if 2007-03-01 10:20:27.000000000 -0500 @@ -0,0 +1,46 @@ + +## policy for consolekit @@ -1777,9 +1723,9 @@ + allow consolekit_t $1:dbus send_msg; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-2.5.6/policy/modules/services/consolekit.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-2.5.7/policy/modules/services/consolekit.te --- nsaserefpolicy/policy/modules/services/consolekit.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/consolekit.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/consolekit.te 2007-03-01 10:20:27.000000000 -0500 @@ -0,0 +1,62 @@ +policy_module(consolekit,1.0.0) + @@ -1843,9 +1789,9 @@ + term_dontaudit_use_generic_ptys(consolekit_t) +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-2.5.6/policy/modules/services/cpucontrol.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-2.5.7/policy/modules/services/cpucontrol.te --- nsaserefpolicy/policy/modules/services/cpucontrol.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/cpucontrol.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cpucontrol.te 2007-03-01 10:20:27.000000000 -0500 @@ -91,6 +91,7 @@ kernel_read_system_state(cpuspeed_t) kernel_read_kernel_sysctls(cpuspeed_t) @@ -1854,17 +1800,17 @@ dev_rw_sysfs(cpuspeed_t) domain_use_interactive_fds(cpuspeed_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-2.5.6/policy/modules/services/cron.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-2.5.7/policy/modules/services/cron.fc --- nsaserefpolicy/policy/modules/services/cron.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/cron.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cron.fc 2007-03-01 10:20:27.000000000 -0500 @@ -45,3 +45,4 @@ /var/spool/fcron/systab\.orig -- gen_context(system_u:object_r:system_cron_spool_t,s0) /var/spool/fcron/systab -- gen_context(system_u:object_r:system_cron_spool_t,s0) /var/spool/fcron/new\.systab -- gen_context(system_u:object_r:system_cron_spool_t,s0) +/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.6/policy/modules/services/cron.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.5.7/policy/modules/services/cron.if --- nsaserefpolicy/policy/modules/services/cron.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/cron.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cron.if 2007-03-01 10:20:27.000000000 -0500 @@ -35,6 +35,7 @@ # template(`cron_per_role_template',` @@ -1973,9 +1919,9 @@ tunable_policy(`fcron_crond',` # fcron wants an instant update of a crontab change for the administrator -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.5.6/policy/modules/services/cron.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.5.7/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/cron.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cron.te 2007-03-01 10:20:27.000000000 -0500 @@ -25,6 +25,9 @@ type cron_log_t; logging_log_file(cron_log_t) @@ -2089,9 +2035,9 @@ mrtg_append_create_logs(system_crond_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.5.6/policy/modules/services/cvs.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.5.7/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/cvs.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cvs.te 2007-03-01 10:20:27.000000000 -0500 @@ -9,6 +9,7 @@ type cvs_t; type cvs_exec_t; @@ -2100,9 +2046,9 @@ role system_r types cvs_t; type cvs_data_t; # customizable -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.5.6/policy/modules/services/dbus.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.5.7/policy/modules/services/dbus.if --- nsaserefpolicy/policy/modules/services/dbus.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/dbus.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/dbus.if 2007-03-01 10:20:27.000000000 -0500 @@ -69,7 +69,7 @@ # Local policy # @@ -2186,9 +2132,9 @@ +') + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-2.5.6/policy/modules/services/dhcp.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-2.5.7/policy/modules/services/dhcp.te --- nsaserefpolicy/policy/modules/services/dhcp.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/dhcp.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/dhcp.te 2007-03-01 10:20:27.000000000 -0500 @@ -125,6 +125,8 @@ dbus_system_bus_client_template(dhcpd,dhcpd_t) dbus_connect_system_bus(dhcpd_t) @@ -2198,9 +2144,189 @@ ') optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.5.6/policy/modules/services/ftp.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-2.5.7/policy/modules/services/fail2ban.fc +--- nsaserefpolicy/policy/modules/services/fail2ban.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/fail2ban.fc 2007-03-01 11:14:04.000000000 -0500 +@@ -0,0 +1,4 @@ ++ ++/usr/bin/fail2ban -- gen_context(system_u:object_r:fail2ban_exec_t,s0) ++/var/log/fail2ban.log -- gen_context(system_u:object_r:fail2ban_log_t,s0) ++/var/run/fail2ban.pid -- gen_context(system_u:object_r:fail2ban_var_run_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-2.5.7/policy/modules/services/fail2ban.if +--- nsaserefpolicy/policy/modules/services/fail2ban.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/fail2ban.if 2007-03-01 11:14:04.000000000 -0500 +@@ -0,0 +1,87 @@ ++ ++## policy for fail2ban ++ ++######################################## ++## ++## Execute a domain transition to run fail2ban. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`fail2ban_domtrans',` ++ gen_require(` ++ type fail2ban_t, fail2ban_exec_t; ++ ') ++ ++ domain_auto_trans($1,fail2ban_exec_t,fail2ban_t) ++ ++ allow fail2ban_t $1:fd use; ++ allow fail2ban_t $1:fifo_file rw_file_perms; ++ allow fail2ban_t $1:process sigchld; ++') ++ ++######################################## ++## ++## Allow the specified domain to read fail2ban's log files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`fail2ban_read_log',` ++ gen_require(` ++ type fail2ban_log_t; ++ ') ++ ++ logging_search_logs($1) ++ allow $1 fail2ban_log_t:dir r_dir_perms; ++ allow $1 fail2ban_log_t:file { read getattr lock }; ++') ++ ++######################################## ++## ++## Allow the specified domain to append ++## fail2ban log files. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`fail2ban_append_log',` ++ gen_require(` ++ type var_log_t, fail2ban_log_t; ++ ') ++ ++ logging_search_logs($1) ++ allow $1 fail2ban_log_t:dir r_dir_perms; ++ allow $1 fail2ban_log_t:file { getattr append }; ++') ++ ++ ++######################################## ++## ++## Read fail2ban PID files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`fail2ban_read_pid_files',` ++ gen_require(` ++ type fail2ban_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 fail2ban_var_run_t:file r_file_perms; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-2.5.7/policy/modules/services/fail2ban.te +--- nsaserefpolicy/policy/modules/services/fail2ban.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/fail2ban.te 2007-03-01 11:16:42.000000000 -0500 +@@ -0,0 +1,77 @@ ++policy_module(fail2ban,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type fail2ban_t; ++type fail2ban_exec_t; ++domain_type(fail2ban_t) ++init_daemon_domain(fail2ban_t, fail2ban_exec_t) ++ ++# log files ++type fail2ban_log_t; ++logging_log_file(fail2ban_log_t) ++ ++# pid files ++type fail2ban_var_run_t; ++files_pid_file(fail2ban_var_run_t) ++ ++######################################## ++# ++# fail2ban local policy ++# ++ ++allow fail2ban_t self : capability { net_admin net_raw }; ++allow fail2ban_t self : process signal; ++allow fail2ban_t self : rawip_socket { getopt create setopt }; ++ ++# Init script handling ++init_use_fds(fail2ban_t) ++init_use_script_ptys(fail2ban_t) ++domain_use_interactive_fds(fail2ban_t) ++ ++## internal communication is often done using fifo and unix sockets. ++allow fail2ban_t self:fifo_file rw_file_perms; ++allow fail2ban_t self:unix_stream_socket create_stream_socket_perms; ++ ++# Some common macros (you might be able to remove some) ++files_read_etc_files(fail2ban_t) ++ ++libs_use_ld_so(fail2ban_t) ++libs_use_shared_libs(fail2ban_t) ++ ++miscfiles_read_localization(fail2ban_t) ++ ++# log files ++allow fail2ban_t fail2ban_log_t:file manage_file_perms; ++allow fail2ban_t fail2ban_log_t:dir { rw_dir_perms setattr }; ++logging_log_filetrans(fail2ban_t,fail2ban_log_t,{ file dir }) ++ ++# pid file ++allow fail2ban_t fail2ban_var_run_t:file manage_file_perms; ++allow fail2ban_t fail2ban_var_run_t:dir rw_dir_perms; ++files_pid_filetrans(fail2ban_t,fail2ban_var_run_t, file) ++ ++corecmd_search_sbin(fail2ban_t) ++corecmd_exec_bin(fail2ban_t) ++corecmd_exec_shell(fail2ban_t) ++ ++dev_read_urand(fail2ban_t) ++ ++files_read_usr_files(fail2ban_t) ++ ++logging_read_generic_logs(fail2ban_t) ++ ++selinux_get_fs_mount(fail2ban_t) ++ ++optional_policy(` ++ iptables_domtrans(fail2ban_t) ++') ++ ++ifdef(`targeted_policy',` ++ term_dontaudit_use_unallocated_ttys(fail2ban_t) ++ term_dontaudit_use_generic_ptys(fail2ban_t) ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.5.7/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2007-02-28 14:03:21.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/ftp.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ftp.te 2007-03-01 10:20:27.000000000 -0500 @@ -190,10 +190,15 @@ userdom_manage_all_users_home_content_dirs(ftpd_t) userdom_manage_all_users_home_content_files(ftpd_t) @@ -2217,9 +2343,9 @@ ') tunable_policy(`ftp_home_dir && use_nfs_home_dirs',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.5.6/policy/modules/services/hal.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.5.7/policy/modules/services/hal.fc --- nsaserefpolicy/policy/modules/services/hal.fc 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/hal.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/hal.fc 2007-03-01 10:20:27.000000000 -0500 @@ -8,4 +8,10 @@ /var/lib/hal(/.*)? gen_context(system_u:object_r:hald_var_lib_t,s0) @@ -2231,9 +2357,9 @@ +/usr/libexec/hal-acl-tool -- gen_context(system_u:object_r:hald_acl_exec_t,s0) + +/usr/libexec/hald-addon-macbookpro-backlight -- gen_context(system_u:object_r:hald_mac_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.6/policy/modules/services/hal.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.7/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/hal.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/hal.te 2007-03-01 10:20:27.000000000 -0500 @@ -16,9 +16,24 @@ type hald_var_run_t; files_pid_file(hald_var_run_t) @@ -2386,9 +2512,9 @@ + term_dontaudit_use_console(hald_mac_t) + term_dontaudit_use_generic_ptys(hald_mac_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.5.6/policy/modules/services/inetd.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.5.7/policy/modules/services/inetd.te --- nsaserefpolicy/policy/modules/services/inetd.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/inetd.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/inetd.te 2007-03-01 10:20:27.000000000 -0500 @@ -140,8 +140,8 @@ mls_fd_use_all_levels(inetd_t) mls_fd_share_all_levels(inetd_t) @@ -2409,9 +2535,9 @@ files_search_home(inetd_child_t) manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.5.6/policy/modules/services/mta.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.5.7/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/mta.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/mta.te 2007-03-01 10:20:27.000000000 -0500 @@ -27,6 +27,7 @@ type sendmail_exec_t; @@ -2428,19 +2554,9 @@ # apache should set close-on-exec apache_dontaudit_append_log(system_mail_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.5.6/policy/modules/services/networkmanager.fc ---- nsaserefpolicy/policy/modules/services/networkmanager.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/networkmanager.fc 2007-02-28 14:54:34.000000000 -0500 -@@ -3,4 +3,5 @@ - /var/run/NetworkManager\.pid -- gen_context(system_u:object_r:NetworkManager_var_run_t,s0) - /var/run/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0) - /var/run/wpa_supplicant(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0) --/var/run/wpa_supplicant-global -- gen_context(system_u:object_r:NetworkManager_var_run_t,s0) -+/var/run/wpa_supplicant-global gen_context(system_u:object_r:NetworkManager_var_run_t,s0) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.5.6/policy/modules/services/nis.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.5.7/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/nis.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/nis.if 2007-03-01 10:20:27.000000000 -0500 @@ -48,8 +48,8 @@ corenet_udp_bind_all_nodes($1) corenet_tcp_bind_generic_port($1) @@ -2452,9 +2568,9 @@ corenet_dontaudit_tcp_bind_all_ports($1) corenet_dontaudit_udp_bind_all_ports($1) corenet_tcp_connect_portmap_port($1) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.5.6/policy/modules/services/nscd.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.5.7/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/nscd.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/nscd.if 2007-03-01 10:20:27.000000000 -0500 @@ -173,3 +173,23 @@ allow $1 nscd_t:nscd *; @@ -2479,9 +2595,9 @@ + role $1 types nscd_t; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.5.6/policy/modules/services/nscd.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.5.7/policy/modules/services/nscd.te --- nsaserefpolicy/policy/modules/services/nscd.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/nscd.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/nscd.te 2007-03-01 10:20:27.000000000 -0500 @@ -117,6 +117,9 @@ term_dontaudit_use_unallocated_ttys(nscd_t) term_dontaudit_use_generic_ptys(nscd_t) @@ -2492,9 +2608,9 @@ ') optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.5.6/policy/modules/services/pegasus.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.5.7/policy/modules/services/pegasus.if --- nsaserefpolicy/policy/modules/services/pegasus.if 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/pegasus.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/pegasus.if 2007-03-01 10:20:27.000000000 -0500 @@ -1 +1,28 @@ ## The Open Group Pegasus CIM/WBEM Server. + @@ -2524,9 +2640,9 @@ + ') + +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.5.6/policy/modules/services/pegasus.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.5.7/policy/modules/services/pegasus.te --- nsaserefpolicy/policy/modules/services/pegasus.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/pegasus.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/pegasus.te 2007-03-01 10:20:27.000000000 -0500 @@ -99,13 +99,12 @@ auth_use_nsswitch(pegasus_t) @@ -2543,9 +2659,9 @@ files_read_var_lib_symlinks(pegasus_t) hostname_exec(pegasus_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-2.5.6/policy/modules/services/postfix.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-2.5.7/policy/modules/services/postfix.fc --- nsaserefpolicy/policy/modules/services/postfix.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/postfix.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/postfix.fc 2007-03-01 10:20:27.000000000 -0500 @@ -9,6 +9,7 @@ /usr/libexec/postfix/(n)?qmgr -- gen_context(system_u:object_r:postfix_qmgr_exec_t,s0) /usr/libexec/postfix/showq -- gen_context(system_u:object_r:postfix_showq_exec_t,s0) @@ -2554,9 +2670,9 @@ /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.6/policy/modules/services/postfix.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.5.7/policy/modules/services/postfix.te --- nsaserefpolicy/policy/modules/services/postfix.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/postfix.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/postfix.te 2007-03-01 10:20:27.000000000 -0500 @@ -173,6 +173,8 @@ mta_rw_aliases(postfix_master_t) mta_read_sendmail_bin(postfix_master_t) @@ -2574,9 +2690,9 @@ read_files_pattern(postfix_pickup_t,postfix_spool_maildrop_t,postfix_spool_maildrop_t) delete_files_pattern(postfix_pickup_t,postfix_spool_maildrop_t,postfix_spool_maildrop_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.5.6/policy/modules/services/procmail.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.5.7/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/procmail.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/procmail.te 2007-03-01 10:20:27.000000000 -0500 @@ -10,15 +10,19 @@ type procmail_exec_t; domain_type(procmail_t) @@ -2619,9 +2735,9 @@ spamassassin_exec_client(procmail_t) + spamassassin_read_lib_files(procmail_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-2.5.6/policy/modules/services/pyzor.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-2.5.7/policy/modules/services/pyzor.if --- nsaserefpolicy/policy/modules/services/pyzor.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/pyzor.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/pyzor.if 2007-03-01 10:20:27.000000000 -0500 @@ -64,6 +64,10 @@ ## # @@ -2655,9 +2771,9 @@ + + allow pyzor_t $1:process signal; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.5.6/policy/modules/services/pyzor.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.5.7/policy/modules/services/pyzor.te --- nsaserefpolicy/policy/modules/services/pyzor.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/pyzor.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/pyzor.te 2007-03-01 10:20:27.000000000 -0500 @@ -26,6 +26,9 @@ type pyzor_var_lib_t; files_type(pyzor_var_lib_t) @@ -2668,7 +2784,7 @@ ######################################## # # Pyzor local policy -@@ -37,6 +40,10 @@ +@@ -37,6 +40,12 @@ read_files_pattern(pyzor_t,pyzor_var_lib_t,pyzor_var_lib_t) files_search_var_lib(pyzor_t) @@ -2676,12 +2792,14 @@ +allow pyzor_t pyzor_tmp_t:file create_file_perms; +files_tmp_filetrans(pyzor_t, pyzor_tmp_t, { file dir }) + ++fs_search_auto_mountpoints(pyzor_t) ++ kernel_read_kernel_sysctls(pyzor_t) kernel_read_system_state(pyzor_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.5.6/policy/modules/services/ricci.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.5.7/policy/modules/services/ricci.te --- nsaserefpolicy/policy/modules/services/ricci.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/ricci.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ricci.te 2007-03-01 10:20:27.000000000 -0500 @@ -420,6 +420,7 @@ files_read_etc_runtime_files(ricci_modservice_t) files_search_usr(ricci_modservice_t) @@ -2719,9 +2837,9 @@ ccs_read_config(ricci_modstorage_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.5.6/policy/modules/services/rpc.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.5.7/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/rpc.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/rpc.te 2007-03-01 10:20:27.000000000 -0500 @@ -120,16 +120,20 @@ # GSSD local policy # @@ -2779,9 +2897,9 @@ +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.6/policy/modules/services/rsync.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.5.7/policy/modules/services/rsync.te --- nsaserefpolicy/policy/modules/services/rsync.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/rsync.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/rsync.te 2007-03-01 10:20:27.000000000 -0500 @@ -9,6 +9,7 @@ type rsync_t; type rsync_exec_t; @@ -2790,9 +2908,9 @@ role system_r types rsync_t; type rsync_data_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.5.6/policy/modules/services/samba.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.5.7/policy/modules/services/samba.if --- nsaserefpolicy/policy/modules/services/samba.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/samba.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/samba.if 2007-03-01 10:20:27.000000000 -0500 @@ -177,6 +177,27 @@ ######################################## @@ -2821,9 +2939,9 @@ ## Execute samba log in the caller domain. ## ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.5.6/policy/modules/services/samba.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.5.7/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/samba.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/samba.te 2007-03-01 10:20:27.000000000 -0500 @@ -278,6 +278,10 @@ userdom_dontaudit_use_unpriv_user_fds(smbd_t) userdom_use_unpriv_users_fds(smbd_t) @@ -2844,9 +2962,9 @@ read_files_pattern(nmbd_t,samba_log_t,samba_log_t) create_files_pattern(nmbd_t,samba_log_t,samba_log_t) allow nmbd_t samba_log_t:dir setattr; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.5.6/policy/modules/services/setroubleshoot.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.5.7/policy/modules/services/setroubleshoot.te --- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/setroubleshoot.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/setroubleshoot.te 2007-03-01 10:20:27.000000000 -0500 @@ -74,8 +74,10 @@ files_read_usr_files(setroubleshootd_t) files_read_etc_files(setroubleshootd_t) @@ -2869,9 +2987,9 @@ ifdef(`targeted_policy',` term_dontaudit_use_generic_ptys(setroubleshootd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.5.6/policy/modules/services/smartmon.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.5.7/policy/modules/services/smartmon.te --- nsaserefpolicy/policy/modules/services/smartmon.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/smartmon.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/smartmon.te 2007-03-01 10:20:27.000000000 -0500 @@ -60,6 +60,7 @@ fs_search_auto_mountpoints(fsdaemon_t) @@ -2880,9 +2998,9 @@ 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/spamassassin.fc serefpolicy-2.5.6/policy/modules/services/spamassassin.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.5.7/policy/modules/services/spamassassin.fc --- nsaserefpolicy/policy/modules/services/spamassassin.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/spamassassin.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/spamassassin.fc 2007-03-01 10:20:27.000000000 -0500 @@ -7,6 +7,7 @@ /usr/sbin/spamd -- gen_context(system_u:object_r:spamd_exec_t,s0) @@ -2891,9 +3009,9 @@ ifdef(`strict_policy',` HOME_DIR/\.spamassassin(/.*)? gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-2.5.6/policy/modules/services/spamassassin.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-2.5.7/policy/modules/services/spamassassin.if --- nsaserefpolicy/policy/modules/services/spamassassin.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/spamassassin.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/spamassassin.if 2007-03-01 10:20:27.000000000 -0500 @@ -496,3 +496,44 @@ dontaudit $1 spamd_tmp_t:sock_file getattr; @@ -2939,9 +3057,9 @@ + read_files_pattern($1,spamd_var_lib_t,spamd_var_lib_t) +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.5.6/policy/modules/services/spamassassin.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.5.7/policy/modules/services/spamassassin.te --- nsaserefpolicy/policy/modules/services/spamassassin.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/spamassassin.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/spamassassin.te 2007-03-01 10:20:27.000000000 -0500 @@ -8,7 +8,7 @@ # spamassassin client executable @@ -3006,17 +3124,17 @@ ') optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-2.5.6/policy/modules/services/squid.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-2.5.7/policy/modules/services/squid.fc --- nsaserefpolicy/policy/modules/services/squid.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/squid.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/squid.fc 2007-03-01 10:20:27.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.6/policy/modules/services/squid.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-2.5.7/policy/modules/services/squid.if --- nsaserefpolicy/policy/modules/services/squid.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/squid.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/squid.if 2007-03-01 10:20:27.000000000 -0500 @@ -36,7 +36,7 @@ ') @@ -3026,9 +3144,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.5.6/policy/modules/services/squid.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.5.7/policy/modules/services/squid.te --- nsaserefpolicy/policy/modules/services/squid.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/squid.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/squid.te 2007-03-01 10:20:27.000000000 -0500 @@ -81,6 +81,8 @@ corenet_tcp_bind_ftp_port(squid_t) corenet_tcp_bind_gopher_port(squid_t) @@ -3059,9 +3177,9 @@ + 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.6/policy/modules/services/ssh.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-2.5.7/policy/modules/services/ssh.fc --- nsaserefpolicy/policy/modules/services/ssh.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/ssh.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ssh.fc 2007-03-01 10:20:27.000000000 -0500 @@ -12,8 +12,6 @@ /var/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) @@ -3071,9 +3189,9 @@ 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.6/policy/modules/services/ssh.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.5.7/policy/modules/services/ssh.if --- nsaserefpolicy/policy/modules/services/ssh.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/ssh.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ssh.if 2007-03-01 10:20:27.000000000 -0500 @@ -728,3 +728,42 @@ dontaudit $1 sshd_key_t:file { getattr read }; @@ -3117,9 +3235,9 @@ + dontaudit $2 $1_ssh_agent_t:fd use; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.5.6/policy/modules/services/ssh.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.5.7/policy/modules/services/ssh.te --- nsaserefpolicy/policy/modules/services/ssh.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/ssh.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ssh.te 2007-03-01 10:20:27.000000000 -0500 @@ -10,11 +10,11 @@ # Type for the ssh-agent executable. @@ -3142,9 +3260,9 @@ ') tunable_policy(`ssh_sysadm_login',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.5.6/policy/modules/services/xserver.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.5.7/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/xserver.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/xserver.if 2007-03-01 10:20:27.000000000 -0500 @@ -826,7 +826,7 @@ type xdm_t; ') @@ -3154,9 +3272,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.5.6/policy/modules/services/xserver.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.5.7/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/services/xserver.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/xserver.te 2007-03-01 10:20:27.000000000 -0500 @@ -345,6 +345,10 @@ ') @@ -3168,14 +3286,14 @@ userhelper_dontaudit_search_config(xdm_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.fc serefpolicy-2.5.6/policy/modules/system/application.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.fc serefpolicy-2.5.7/policy/modules/system/application.fc --- nsaserefpolicy/policy/modules/system/application.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/application.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/application.fc 2007-03-01 10:20:27.000000000 -0500 @@ -0,0 +1 @@ +# No application file contexts. -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-2.5.6/policy/modules/system/application.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-2.5.7/policy/modules/system/application.if --- nsaserefpolicy/policy/modules/system/application.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/application.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/application.if 2007-03-01 10:20:27.000000000 -0500 @@ -0,0 +1,41 @@ +## Policy for application domains + @@ -3218,9 +3336,9 @@ + + can_exec($1, application_exec_type) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-2.5.6/policy/modules/system/application.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-2.5.7/policy/modules/system/application.te --- nsaserefpolicy/policy/modules/system/application.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/application.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/application.te 2007-03-01 10:20:27.000000000 -0500 @@ -0,0 +1,6 @@ + +policy_module(application,1.0.0) @@ -3228,9 +3346,9 @@ +# Executables to be run by user +attribute application_exec_type; + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.5.6/policy/modules/system/authlogin.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.5.7/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/authlogin.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/authlogin.if 2007-03-01 10:20:27.000000000 -0500 @@ -152,21 +152,12 @@ ## # @@ -3358,9 +3476,9 @@ + + typeattribute $1 keyring_type; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.5.6/policy/modules/system/authlogin.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.5.7/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/authlogin.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/authlogin.te 2007-03-01 10:20:27.000000000 -0500 @@ -9,6 +9,7 @@ attribute can_read_shadow_passwords; attribute can_write_shadow_passwords; @@ -3378,9 +3496,9 @@ 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/fstools.fc serefpolicy-2.5.6/policy/modules/system/fstools.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.5.7/policy/modules/system/fstools.fc --- nsaserefpolicy/policy/modules/system/fstools.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/fstools.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/fstools.fc 2007-03-01 10:20:27.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) @@ -3389,9 +3507,9 @@ /sbin/parted -- gen_context(system_u:object_r:fsadm_exec_t,s0) /sbin/partprobe -- gen_context(system_u:object_r:fsadm_exec_t,s0) /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.6/policy/modules/system/fstools.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.5.7/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/fstools.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/fstools.te 2007-03-01 10:20:27.000000000 -0500 @@ -9,6 +9,7 @@ type fsadm_t; type fsadm_exec_t; @@ -3400,9 +3518,9 @@ role system_r types fsadm_t; type fsadm_log_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.5.6/policy/modules/system/getty.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.5.7/policy/modules/system/getty.te --- nsaserefpolicy/policy/modules/system/getty.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/getty.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/getty.te 2007-03-01 10:20:27.000000000 -0500 @@ -33,7 +33,8 @@ # @@ -3413,9 +3531,9 @@ dontaudit getty_t self:capability sys_tty_config; allow getty_t self:process { getpgid setpgid getsession signal_perms }; allow getty_t self:fifo_file rw_fifo_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.5.6/policy/modules/system/hostname.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.5.7/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/hostname.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/hostname.te 2007-03-01 10:20:27.000000000 -0500 @@ -8,8 +8,12 @@ type hostname_t; @@ -3442,9 +3560,9 @@ +optional_policy(` + unconfined_dontaudit_rw_pipes(hostname_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.5.6/policy/modules/system/init.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.5.7/policy/modules/system/init.if --- nsaserefpolicy/policy/modules/system/init.if 2007-02-26 14:17:21.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/init.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/init.if 2007-03-01 10:20:27.000000000 -0500 @@ -202,11 +202,14 @@ gen_require(` type initrc_t; @@ -3523,9 +3641,9 @@ + + allow $1 init_t:process ptrace; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.5.6/policy/modules/system/init.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.5.7/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2007-02-26 14:17:21.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/init.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/init.te 2007-03-01 10:20:27.000000000 -0500 @@ -205,8 +205,7 @@ allow initrc_t initrc_devpts_t:chr_file rw_term_perms; term_create_pty(initrc_t,initrc_devpts_t) @@ -3583,9 +3701,9 @@ ') optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-2.5.6/policy/modules/system/ipsec.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-2.5.7/policy/modules/system/ipsec.if --- nsaserefpolicy/policy/modules/system/ipsec.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/ipsec.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/ipsec.if 2007-03-01 10:20:27.000000000 -0500 @@ -111,3 +111,103 @@ files_search_pids($1) manage_files_pattern($1,ipsec_var_run_t,ipsec_var_run_t) @@ -3690,9 +3808,9 @@ + 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/iptables.te serefpolicy-2.5.6/policy/modules/system/iptables.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.5.7/policy/modules/system/iptables.te --- nsaserefpolicy/policy/modules/system/iptables.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/iptables.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/iptables.te 2007-03-01 11:15:04.000000000 -0500 @@ -77,9 +77,10 @@ userdom_use_all_users_fds(iptables_t) @@ -3706,32 +3824,17 @@ ') optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.5.6/policy/modules/system/libraries.fc ---- nsaserefpolicy/policy/modules/system/libraries.fc 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/libraries.fc 2007-02-28 14:54:34.000000000 -0500 -@@ -80,6 +80,7 @@ - /opt/(.*/)?java/.+\.jar -- gen_context(system_u:object_r:shlib_t,s0) - /opt/(.*/)?jre/.+\.jar -- gen_context(system_u:object_r:shlib_t,s0) - /opt/ibm/java2-ppc64-50/jre/bin/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/opt/cxoffice/lib/wine/.+\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - ifdef(`distro_gentoo',` - # despite the extensions, they are actually libs -@@ -276,7 +277,10 @@ - /usr/(local/)?acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/(local/)?Adobe/.*\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/(local/)?lib/xchat/plugins/systray.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/local/matlab.*/bin/glnx86/libmwlapack\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/(local/)?matlab.*/bin/glnx86/libmwlapack\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/(local/)?matlab.*/sys/os/glnx86/libtermcap.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/(local/)?matlab.*/bin/glnx86/(libmw(lapack|mathutil|services)|lapack|libmkl).so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +@@ -111,3 +112,7 @@ + optional_policy(` + udev_read_db(iptables_t) + ') + - /usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - /usr/lib/acroread/(.*/)?sidecars/* -- 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.6/policy/modules/system/locallogin.te ++optional_policy(` ++ fail2ban_append_log(iptables_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.5.7/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/locallogin.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/locallogin.te 2007-03-01 10:20:27.000000000 -0500 @@ -48,6 +48,8 @@ allow local_login_t self:msgq create_msgq_perms; allow local_login_t self:msg { send receive }; @@ -3759,9 +3862,9 @@ corecmd_list_sbin(local_login_t) corecmd_read_bin_symlinks(local_login_t) corecmd_read_sbin_symlinks(local_login_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.5.6/policy/modules/system/logging.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.5.7/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/logging.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/logging.te 2007-03-01 10:20:27.000000000 -0500 @@ -328,6 +328,9 @@ corenet_tcp_bind_all_nodes(syslogd_t) corenet_tcp_bind_rsh_port(syslogd_t) @@ -3781,9 +3884,9 @@ + 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.6/policy/modules/system/lvm.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.if serefpolicy-2.5.7/policy/modules/system/lvm.if --- nsaserefpolicy/policy/modules/system/lvm.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/lvm.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/lvm.if 2007-03-01 10:20:27.000000000 -0500 @@ -63,10 +63,31 @@ # interface(`lvm_read_config',` @@ -3817,9 +3920,9 @@ + 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.6/policy/modules/system/lvm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.7/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/lvm.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/lvm.te 2007-03-01 10:20:27.000000000 -0500 @@ -46,7 +46,7 @@ allow clvmd_t self:capability { sys_admin mknod }; @@ -3879,18 +3982,9 @@ gpm_dontaudit_getattr_gpmctl(lvm_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.5.6/policy/modules/system/miscfiles.fc ---- nsaserefpolicy/policy/modules/system/miscfiles.fc 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/miscfiles.fc 2007-02-28 14:54:34.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) - ') -+/var/spool/postfix/etc/localtime -- gen_context(system_u:object_r:locale_t,s0) -+/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/modutils.te serefpolicy-2.5.6/policy/modules/system/modutils.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.5.7/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/modutils.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/modutils.te 2007-03-01 10:20:27.000000000 -0500 @@ -54,6 +54,8 @@ can_exec(insmod_t, insmod_exec_t) @@ -3908,9 +4002,9 @@ fs_getattr_xattr_fs(depmod_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.5.6/policy/modules/system/mount.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.5.7/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/mount.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/mount.te 2007-03-01 10:20:27.000000000 -0500 @@ -9,6 +9,7 @@ type mount_t; type mount_exec_t; @@ -3945,9 +4039,9 @@ ') ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.5.6/policy/modules/system/selinuxutil.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.5.7/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/selinuxutil.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/selinuxutil.fc 2007-03-01 10:20:27.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) @@ -3958,9 +4052,9 @@ # # /var/run -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.5.6/policy/modules/system/selinuxutil.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.5.7/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/selinuxutil.if 2007-02-28 15:56:43.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/selinuxutil.if 2007-03-01 10:20:27.000000000 -0500 @@ -616,7 +616,7 @@ gen_require(` type selinux_config_t; @@ -4105,9 +4199,9 @@ + ') +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.6/policy/modules/system/selinuxutil.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.7/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/selinuxutil.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/selinuxutil.te 2007-03-01 10:20:27.000000000 -0500 @@ -1,10 +1,8 @@ policy_module(selinuxutil,1.4.1) @@ -4276,18 +4370,18 @@ + ssh_rw_stream_sockets(load_policy_t) +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.6/policy/modules/system/unconfined.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.7/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/unconfined.fc 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/unconfined.fc 2007-03-01 10:20:27.000000000 -0500 @@ -10,4 +10,5 @@ /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) /usr/lib/ia32el/ia32x_loader -- 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.te serefpolicy-2.5.6/policy/modules/system/unconfined.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.7/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/unconfined.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/unconfined.te 2007-03-01 10:20:27.000000000 -0500 @@ -50,6 +50,8 @@ userdom_unconfined(unconfined_t) userdom_priveleged_home_dir_manager(unconfined_t) @@ -4335,9 +4429,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.if serefpolicy-2.5.6/policy/modules/system/userdomain.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.7/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/userdomain.if 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/userdomain.if 2007-03-01 10:20:27.000000000 -0500 @@ -115,6 +115,10 @@ # Allow making the stack executable via mprotect. allow $1_t self:process execstack; @@ -4739,9 +4833,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.6/policy/modules/system/userdomain.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.7/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/userdomain.te 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/userdomain.te 2007-03-01 10:20:27.000000000 -0500 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -4830,9 +4924,9 @@ + ssh_per_role_template(user, user_t, user_r) + ') ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.6/policy/modules/system/xen.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.7/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.6/policy/modules/system/xen.te 2007-02-28 16:03:02.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/xen.te 2007-03-01 10:20:27.000000000 -0500 @@ -166,8 +166,13 @@ files_manage_etc_runtime_files(xend_t) files_etc_filetrans_etc_runtime(xend_t,file) @@ -4885,9 +4979,9 @@ +fs_read_nfs_files(xend_t) +fs_getattr_all_fs(xend_t) +fs_read_dos_files(xend_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.6/policy/support/obj_perm_sets.spt +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.7/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.6/policy/support/obj_perm_sets.spt 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/policy/support/obj_perm_sets.spt 2007-03-01 10:20:27.000000000 -0500 @@ -215,7 +215,7 @@ define(`getattr_file_perms',`{ getattr }') define(`setattr_file_perms',`{ setattr }') @@ -4897,9 +4991,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.6/Rules.modular +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.7/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-16 17:15:29.000000000 -0500 -+++ serefpolicy-2.5.6/Rules.modular 2007-02-28 14:54:34.000000000 -0500 ++++ serefpolicy-2.5.7/Rules.modular 2007-03-01 10:20:27.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.403 retrieving revision 1.404 diff -u -r1.403 -r1.404 --- selinux-policy.spec 28 Feb 2007 21:22:01 -0000 1.403 +++ selinux-policy.spec 1 Mar 2007 16:30:20 -0000 1.404 @@ -16,7 +16,7 @@ %define CHECKPOLICYVER 1.30.11-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.5.6 +Version: 2.5.7 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -356,6 +356,10 @@ %endif %changelog +* Thu Mar 1 2007 Dan Walsh 2.5.7-1 +- Update to latest from upstream +- Add fail2ban policy + * Wed Feb 28 2007 Dan Walsh 2.5.6-1 - Update to remove security_t:filesystem getattr problems From fedora-cvs-commits at redhat.com Thu Mar 1 16:37:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 11:37:26 -0500 Subject: rpms/lsof/devel lsof.spec,1.36,1.37 Message-ID: <200703011637.l21GbQ5I029245@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/lsof/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29198 Modified Files: lsof.spec Log Message: * Thu Mar 1 2007 Karel Zak 4.78-5 - fix License Index: lsof.spec =================================================================== RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- lsof.spec 1 Mar 2007 16:10:36 -0000 1.36 +++ lsof.spec 1 Mar 2007 16:37:24 -0000 1.37 @@ -1,8 +1,8 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.78 -Release: 4%{?dist} -License: Free +Release: 5%{?dist} +License: Distributable Group: Development/Debuggers %define lsofrh lsof_4.78C-rh Source0: %{lsofrh}.tar.bz2 @@ -44,6 +44,9 @@ %{_mandir}/man*/* %changelog +* Thu Mar 1 2007 Karel Zak 4.78-5 +- fix License + * Thu Mar 1 2007 Karel Zak 4.78-4 - fix #226108 - Merge Review: lsof From fedora-cvs-commits at redhat.com Thu Mar 1 16:43:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 11:43:08 -0500 Subject: rpms/vte/devel .cvsignore, 1.53, 1.54 sources, 1.53, 1.54 vte.spec, 1.100, 1.101 Message-ID: <200703011643.l21Gh8jG001112@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/vte/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1004 Modified Files: .cvsignore sources vte.spec Log Message: * Thu Mar 01 2007 Behdad Esfahbod 0.15.6-1 - Update to 0.15.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 28 Feb 2007 04:29:25 -0000 1.53 +++ .cvsignore 1 Mar 2007 16:43:06 -0000 1.54 @@ -1 +1 @@ -vte-0.15.5.tar.bz2 +vte-0.15.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/vte/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 28 Feb 2007 04:29:25 -0000 1.53 +++ sources 1 Mar 2007 16:43:06 -0000 1.54 @@ -1 +1 @@ -90c8b178cf09e0454236a8ed1183fe45 vte-0.15.5.tar.bz2 +0219942a3994a0a0b4355c8745c04b8b vte-0.15.6.tar.bz2 Index: vte.spec =================================================================== RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- vte.spec 28 Feb 2007 04:29:25 -0000 1.100 +++ vte.spec 1 Mar 2007 16:43:06 -0000 1.101 @@ -1,5 +1,5 @@ Name: vte -Version: 0.15.5 +Version: 0.15.6 Release: 1%{?dist} Summary: A terminal emulator License: LGPL @@ -101,6 +101,9 @@ %{_libdir}/pkgconfig/* %changelog +* Thu Mar 01 2007 Behdad Esfahbod 0.15.6-1 +- Update to 0.15.6 + * Tue Feb 27 2007 Matthias Clasen 0.15.5-1 - Update to 0.15.5 From fedora-cvs-commits at redhat.com Thu Mar 1 17:36:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 12:36:27 -0500 Subject: rpms/coreutils/devel coreutils-getfacl-exit-code.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 coreutils-i18n.patch, 1.20, 1.21 coreutils-selinux.patch, 1.33, 1.34 coreutils.spec, 1.165, 1.166 sources, 1.13, 1.14 Message-ID: <200703011736.l21HaRxj032136@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32686 Modified Files: .cvsignore coreutils-i18n.patch coreutils-selinux.patch coreutils.spec sources Added Files: coreutils-getfacl-exit-code.patch Log Message: * Thu Mar 1 2007 Tim Waugh - 6.8+, in preparation for 6.9. coreutils-getfacl-exit-code.patch: acl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE coreutils-getfacl-exit-code.patch --- --- coreutils-6.8+/tests/cp/acl.getfacl-exit-code 2007-03-01 16:48:29.000000000 +0000 +++ coreutils-6.8+/tests/cp/acl 2007-03-01 16:49:35.000000000 +0000 @@ -70,16 +70,16 @@ # copy a file without preserving permissions cp a/file b/ || fail=1 -acl2=`cd b && getfacl file` || framework_failure=1 +acl2=`cd b && getfacl file` test "$acl1" = "$acl2" || fail=1 rm a/file || framework_failure=1 # copy a file, preserving permissions touch a/file || framework_failure=1 -setfacl -m user:bin:rw a/file || framework_failure=1 -acl1=`cd a && getfacl file` || framework_failure=1 +setfacl -m user:bin:rw a/file +acl1=`cd a && getfacl file` cp -p a/file b/ || fail=1 -acl2=`cd b && getfacl file` || framework_failure=1 +acl2=`cd b && getfacl file` test "$acl1" = "$acl2" || fail=1 if test $framework_failure = 1; then Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 9 Jan 2007 19:29:30 -0000 1.11 +++ .cvsignore 1 Mar 2007 17:36:24 -0000 1.12 @@ -6,3 +6,4 @@ coreutils-5.96.tar.bz2 coreutils-5.97.tar.bz2 coreutils-6.7.tar.bz2 +coreutils-6.8+-ss-2007-03-01.11.42.23+0.tar.gz 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(-) Index: coreutils-i18n.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-i18n.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- coreutils-i18n.patch 9 Jan 2007 19:29:30 -0000 1.20 +++ coreutils-i18n.patch 1 Mar 2007 17:36:24 -0000 1.21 @@ -1,5 +1,5 @@ ---- /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 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/tests/sort/sort-mb-tests 2007-03-01 15:08:24.000000000 +0000 @@ -0,0 +1,58 @@ +#! /bin/sh +case $# in @@ -59,38 +59,38 @@ +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 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/tests/sort/mb2.I 2007-03-01 15:08:24.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 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/tests/sort/mb2.X 2007-03-01 15:08:24.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 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/tests/sort/mb1.I 2007-03-01 15:08:24.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 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/tests/sort/mb1.X 2007-03-01 15:08:24.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 +--- coreutils-6.8+/tests/sort/Makefile.am.i18n 2007-01-24 07:47:37.000000000 +0000 ++++ coreutils-6.8+/tests/sort/Makefile.am 2007-03-01 15:09:59.000000000 +0000 +@@ -66,15 +66,17 @@ + bigfield.O bigfield.E ##test-files-end -EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) @@ -100,6 +100,7 @@ +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 = \ + CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \ PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' @@ -109,8 +110,8 @@ 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 +--- coreutils-6.8+/lib/linebuffer.h.i18n 2005-05-14 07:44:24.000000000 +0100 ++++ coreutils-6.8+/lib/linebuffer.h 2007-03-01 15:08:24.000000000 +0000 @@ -22,6 +22,11 @@ # include @@ -133,8 +134,8 @@ }; /* 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 +--- coreutils-6.8+/src/expand.c.i18n 2007-01-14 15:41:28.000000000 +0000 ++++ coreutils-6.8+/src/expand.c 2007-03-01 15:08:24.000000000 +0000 @@ -38,11 +38,28 @@ #include #include @@ -329,8 +330,8 @@ if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); ---- 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 +--- coreutils-6.8+/src/join.c.i18n 2007-01-14 15:41:28.000000000 +0000 ++++ coreutils-6.8+/src/join.c 2007-03-01 15:08:24.000000000 +0000 @@ -23,16 +23,30 @@ #include #include @@ -774,7 +775,7 @@ prfield (i, line2); } putchar ('\n'); -@@ -862,20 +1093,41 @@ +@@ -859,20 +1090,41 @@ case 't': { @@ -826,8 +827,8 @@ } break; ---- coreutils-6.7/src/uniq.c.i18n 2006-10-22 17:54:15.000000000 +0100 -+++ coreutils-6.7/src/uniq.c 2007-01-09 17:18:28.000000000 +0000 +--- coreutils-6.8+/src/uniq.c.i18n 2007-01-14 15:41:28.000000000 +0000 ++++ coreutils-6.8+/src/uniq.c 2007-03-01 15:08:24.000000000 +0000 @@ -23,6 +23,16 @@ #include #include @@ -877,7 +878,7 @@ static struct option const longopts[] = { {"count", no_argument, NULL, 'c'}, -@@ -189,7 +215,7 @@ +@@ -198,7 +224,7 @@ return a pointer to the beginning of the line's field to be compared. */ static char * @@ -886,7 +887,7 @@ { size_t count; char *lp = line->buffer; -@@ -210,6 +236,83 @@ +@@ -219,6 +245,83 @@ return lp + i; } @@ -970,7 +971,7 @@ /* Return false if two strings OLD and NEW match, true if not. OLD and NEW point not to the beginnings of the lines but rather to the beginnings of the fields to compare. -@@ -218,6 +321,8 @@ +@@ -227,6 +330,8 @@ static bool different (char *old, char *new, size_t oldlen, size_t newlen) { @@ -979,7 +980,7 @@ if (check_chars < oldlen) oldlen = check_chars; if (check_chars < newlen) -@@ -225,14 +330,92 @@ +@@ -234,14 +339,92 @@ if (ignore_case) { @@ -1077,7 +1078,7 @@ /* Output the line in linebuffer LINE to standard output provided that the switches say it should be output. -@@ -286,15 +469,43 @@ +@@ -295,15 +478,43 @@ { char *prevfield IF_LINT (= NULL); size_t prevlen IF_LINT (= 0); @@ -1121,7 +1122,7 @@ if (prevline->length == 0 || different (thisfield, prevfield, thislen, prevlen)) { -@@ -313,17 +524,26 @@ +@@ -322,17 +533,26 @@ size_t prevlen; uintmax_t match_count = 0; bool first_delimiter = true; @@ -1148,7 +1149,7 @@ if (readlinebuffer (thisline, stdin) == 0) { if (ferror (stdin)) -@@ -332,6 +552,15 @@ +@@ -341,6 +561,15 @@ } thisfield = find_field (thisline); thislen = thisline->length - 1 - (thisfield - thisline->buffer); @@ -1164,7 +1165,7 @@ match = !different (thisfield, prevfield, thislen, prevlen); match_count += match; -@@ -364,6 +593,9 @@ +@@ -373,6 +602,9 @@ SWAP_LINES (prevline, thisline); prevfield = thisfield; prevlen = thislen; @@ -1174,7 +1175,7 @@ if (!match) match_count = 0; } -@@ -408,6 +640,19 @@ +@@ -417,6 +649,19 @@ atexit (close_stdout); @@ -1194,8 +1195,8 @@ skip_chars = 0; skip_fields = 0; check_chars = SIZE_MAX; ---- coreutils-6.7/src/fold.c.i18n 2006-10-24 23:35:57.000000000 +0100 -+++ coreutils-6.7/src/fold.c 2007-01-09 17:23:46.000000000 +0000 +--- coreutils-6.8+/src/fold.c.i18n 2007-02-23 12:01:47.000000000 +0000 ++++ coreutils-6.8+/src/fold.c 2007-03-01 15:08:24.000000000 +0000 @@ -23,11 +23,33 @@ #include #include @@ -1599,15 +1600,16 @@ break; case 's': /* Break at word boundaries. */ ---- coreutils-6.7/src/sort.c.i18n 2006-11-13 18:14:02.000000000 +0000 -+++ coreutils-6.7/src/sort.c 2007-01-09 17:18:28.000000000 +0000 -@@ -23,9 +23,18 @@ +--- coreutils-6.8+/src/sort.c.i18n 2007-02-24 11:23:23.000000000 +0000 ++++ coreutils-6.8+/src/sort.c 2007-03-01 15:10:57.000000000 +0000 +@@ -23,10 +23,19 @@ #include +#include #include #include + #include #include +#if HAVE_WCHAR_H +# include @@ -1618,9 +1620,9 @@ +#endif + #include "system.h" + #include "argmatch.h" #include "error.h" - #include "hard-locale.h" -@@ -98,14 +107,38 @@ +@@ -116,14 +125,38 @@ /* Thousands separator; if -1, then there isn't one. */ static int thousands_sep; @@ -1660,7 +1662,7 @@ /* The kind of blanks for '-b' to skip in various options. */ enum blanktype { bl_start, bl_end, bl_both }; -@@ -243,13 +276,11 @@ +@@ -261,13 +294,11 @@ they were read if all keys compare equal. */ static bool stable; @@ -1677,9 +1679,9 @@ /* Flag to remove consecutive duplicate lines from the output. Only the last of a sequence of equal lines will be output. */ -@@ -408,6 +439,44 @@ - static struct tempnode *volatile temphead; - static struct tempnode *volatile *temptail = &temphead; +@@ -639,6 +670,44 @@ + update_proc (pid); + } +/* Function pointers. */ +static void @@ -1722,7 +1724,7 @@ /* Clean up any remaining temporary files. */ static void -@@ -561,7 +630,7 @@ +@@ -978,7 +1047,7 @@ free (node); } @@ -1731,7 +1733,7 @@ static int struct_month_cmp (const void *m1, const void *m2) -@@ -576,7 +645,7 @@ +@@ -993,7 +1062,7 @@ /* Initialize the character class tables. */ static void @@ -1740,7 +1742,7 @@ { size_t i; -@@ -588,7 +657,7 @@ +@@ -1005,7 +1074,7 @@ fold_toupper[i] = toupper (i); } @@ -1749,7 +1751,7 @@ /* If we're not in the "C" locale, read different names for months. */ if (hard_LC_TIME) { -@@ -614,6 +683,64 @@ +@@ -1031,6 +1100,64 @@ #endif } @@ -1814,7 +1816,7 @@ /* Specify the amount of main memory to use when sorting. */ static void specify_sort_size (char const *s) -@@ -824,7 +951,7 @@ +@@ -1241,7 +1368,7 @@ by KEY in LINE. */ static char * @@ -1823,7 +1825,7 @@ { char *ptr = line->text, *lim = ptr + line->length - 1; size_t sword = key->sword; -@@ -834,10 +961,10 @@ +@@ -1251,10 +1378,10 @@ /* The leading field separator itself is included in a field when -t is absent. */ @@ -1836,7 +1838,7 @@ ++ptr; if (ptr < lim) ++ptr; -@@ -865,11 +992,70 @@ +@@ -1282,11 +1409,70 @@ return ptr; } @@ -1908,7 +1910,7 @@ { char *ptr = line->text, *lim = ptr + line->length - 1; size_t eword = key->eword, echar = key->echar; -@@ -882,10 +1068,10 @@ +@@ -1299,10 +1485,10 @@ `beginning' is the first character following the delimiting TAB. Otherwise, leave PTR pointing at the first `blank' character after the preceding field. */ @@ -1921,7 +1923,7 @@ ++ptr; if (ptr < lim && (eword | echar)) ++ptr; -@@ -931,10 +1117,10 @@ +@@ -1348,10 +1534,10 @@ */ /* Make LIM point to the end of (one byte past) the current field. */ @@ -1934,7 +1936,7 @@ if (newlim) lim = newlim; } -@@ -967,6 +1153,107 @@ +@@ -1384,6 +1570,107 @@ return ptr; } @@ -2042,7 +2044,7 @@ /* Fill BUF reading from FP, moving buf->left bytes from the end of buf->buf to the beginning first. If EOF is reached and the file wasn't terminated by a newline, supply one. Set up BUF's line -@@ -1049,8 +1336,24 @@ +@@ -1466,8 +1753,24 @@ else { if (key->skipsblanks) @@ -2069,7 +2071,7 @@ line->keybeg = line_start; } } -@@ -1083,7 +1386,7 @@ +@@ -1500,7 +1803,7 @@ hideously fast. */ static int @@ -2078,7 +2080,7 @@ { while (blanks[to_uchar (*a)]) a++; -@@ -1093,6 +1396,25 @@ +@@ -1510,6 +1813,25 @@ return strnumcmp (a, b, decimal_point, thousands_sep); } @@ -2104,7 +2106,7 @@ static int general_numcompare (const char *sa, const char *sb) { -@@ -1126,7 +1448,7 @@ +@@ -1543,7 +1865,7 @@ Return 0 if the name in S is not recognized. */ static int @@ -2113,7 +2115,7 @@ { size_t lo = 0; size_t hi = MONTHS_PER_YEAR; -@@ -1281,11 +1603,79 @@ +@@ -1698,11 +2020,79 @@ return diff; } @@ -2194,7 +2196,7 @@ { struct keyfield const *key = keylist; -@@ -1458,6 +1848,177 @@ +@@ -1875,6 +2265,177 @@ return key->reverse ? -diff : diff; } @@ -2372,8 +2374,8 @@ /* Compare two lines A and B, returning negative, zero, or positive depending on whether A compares less than, equal to, or greater than B. */ -@@ -2309,7 +2870,7 @@ - atexit (close_stdout); +@@ -2744,7 +3305,7 @@ + initialize_exit_failure (SORT_FAILURE); hard_LC_COLLATE = hard_locale (LC_COLLATE); -#if HAVE_NL_LANGINFO @@ -2381,7 +2383,7 @@ hard_LC_TIME = hard_locale (LC_TIME); #endif -@@ -2330,6 +2891,27 @@ +@@ -2765,6 +3326,27 @@ thousands_sep = -1; } @@ -2409,7 +2411,7 @@ have_read_stdin = false; inittables (); -@@ -2544,13 +3126,35 @@ +@@ -3015,13 +3597,35 @@ case 't': { @@ -2449,7 +2451,7 @@ else { /* Provoke with `sort -txx'. Complain about -@@ -2561,9 +3165,12 @@ +@@ -3032,9 +3636,12 @@ quote (optarg)); } } @@ -2464,8 +2466,8 @@ } break; ---- coreutils-6.7/src/unexpand.c.i18n 2006-10-22 17:54:15.000000000 +0100 -+++ coreutils-6.7/src/unexpand.c 2007-01-09 17:18:28.000000000 +0000 +--- coreutils-6.8+/src/unexpand.c.i18n 2007-01-14 15:41:28.000000000 +0000 ++++ coreutils-6.8+/src/unexpand.c 2007-03-01 15:08:24.000000000 +0000 @@ -39,11 +39,28 @@ #include #include @@ -2718,8 +2720,8 @@ if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); ---- coreutils-6.7/src/pr.c.i18n 2006-10-24 23:59:25.000000000 +0100 -+++ coreutils-6.7/src/pr.c 2007-01-09 17:18:28.000000000 +0000 +--- coreutils-6.8+/src/pr.c.i18n 2007-01-14 15:41:28.000000000 +0000 ++++ coreutils-6.8+/src/pr.c 2007-03-01 15:08:24.000000000 +0000 @@ -313,6 +313,32 @@ #include @@ -3442,8 +3444,8 @@ /* We've just printed some files and need to clean up things before looking for more options and printing the next batch of files. ---- coreutils-6.7/src/cut.c.i18n 2006-11-27 10:25:51.000000000 +0000 -+++ coreutils-6.7/src/cut.c 2007-01-09 17:18:28.000000000 +0000 +--- coreutils-6.8+/src/cut.c.i18n 2007-01-14 15:41:28.000000000 +0000 ++++ coreutils-6.8+/src/cut.c 2007-03-01 15:08:24.000000000 +0000 @@ -29,6 +29,11 @@ #include #include @@ -3709,7 +3711,7 @@ /* Read from stream STREAM, printing to standard output any selected fields. */ static void -@@ -691,13 +830,192 @@ +@@ -692,13 +831,192 @@ } } @@ -3905,7 +3907,7 @@ } /* Process file FILE to standard output. -@@ -747,6 +1065,8 @@ +@@ -748,6 +1066,8 @@ bool ok; bool delim_specified = false; char *spec_list_string IF_LINT(= NULL); @@ -3914,7 +3916,7 @@ initialize_main (&argc, &argv); program_name = argv[0]; -@@ -769,7 +1089,6 @@ +@@ -770,7 +1090,6 @@ switch (optc) { case 'b': @@ -3922,7 +3924,7 @@ /* Build the byte list. */ if (operating_mode != undefined_mode) FATAL_ERROR (_("only one type of list may be specified")); -@@ -777,6 +1096,14 @@ +@@ -778,6 +1097,14 @@ spec_list_string = optarg; break; @@ -3937,7 +3939,7 @@ case 'f': /* Build the field list. */ if (operating_mode != undefined_mode) -@@ -788,10 +1115,35 @@ +@@ -789,10 +1116,35 @@ case 'd': /* New delimiter. */ /* Interpret -d '' to mean `use the NUL byte as the delimiter.' */ @@ -3977,7 +3979,7 @@ break; case OUTPUT_DELIMITER_OPTION: -@@ -804,6 +1156,7 @@ +@@ -805,6 +1157,7 @@ break; case 'n': @@ -3985,7 +3987,7 @@ break; case 's': -@@ -826,7 +1179,7 @@ +@@ -827,7 +1180,7 @@ if (operating_mode == undefined_mode) FATAL_ERROR (_("you must specify a list of bytes, characters, or fields")); @@ -3994,7 +3996,7 @@ FATAL_ERROR (_("an input delimiter may be specified only\ when operating on fields")); -@@ -853,15 +1206,34 @@ +@@ -854,15 +1207,34 @@ } if (!delim_specified) 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 | 210 +++++++++++++++++++++++++- 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, 1631 insertions(+), 54 deletions(-) Index: coreutils-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-selinux.patch,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- coreutils-selinux.patch 12 Jan 2007 16:07:44 -0000 1.33 +++ coreutils-selinux.patch 1 Mar 2007 17:36:24 -0000 1.34 @@ -1,5 +1,5 @@ ---- coreutils-6.7/tests/help-version.selinux 2007-01-09 18:47:03.000000000 +0000 -+++ coreutils-6.7/tests/help-version 2007-01-09 18:47:04.000000000 +0000 +--- coreutils-6.8+/tests/help-version.selinux 2007-03-01 15:52:06.000000000 +0000 ++++ coreutils-6.8+/tests/help-version 2007-03-01 15:52:06.000000000 +0000 @@ -72,6 +72,8 @@ # Skip `test'; it doesn't accept --help or --version. @@ -18,9 +18,9 @@ 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-10 14:01:08.000000000 +0000 -@@ -110,6 +110,18 @@ +--- coreutils-6.8+/src/ls.c.selinux 2007-03-01 06:51:46.000000000 +0000 ++++ coreutils-6.8+/src/ls.c 2007-03-01 15:53:13.000000000 +0000 +@@ -111,6 +111,18 @@ #define AUTHORS "Richard Stallman", "David MacKenzie" @@ -39,7 +39,7 @@ #define obstack_chunk_alloc malloc #define obstack_chunk_free free -@@ -132,7 +144,8 @@ +@@ -133,7 +145,8 @@ symbolic_link, sock, whiteout, @@ -49,7 +49,7 @@ }; /* Display letters and indicators for each filetype. -@@ -175,6 +188,10 @@ +@@ -177,6 +190,10 @@ /* For long listings, true if the file has an access control list. */ bool have_acl; #endif @@ -60,7 +60,7 @@ }; #if USE_ACL -@@ -245,6 +262,9 @@ +@@ -247,6 +264,9 @@ static void sort_files (void); static void parse_ls_color (void); void usage (int status); @@ -70,7 +70,7 @@ /* The name this program was run with. */ char *program_name; -@@ -353,7 +373,11 @@ +@@ -360,7 +380,11 @@ one_per_line, /* -1 */ many_per_line, /* -C */ horizontal, /* -x */ @@ -83,7 +83,7 @@ }; static enum format format; -@@ -734,6 +758,11 @@ +@@ -741,6 +765,11 @@ SHOW_CONTROL_CHARS_OPTION, SI_OPTION, SORT_OPTION, @@ -95,7 +95,7 @@ TIME_OPTION, TIME_STYLE_OPTION }; -@@ -780,6 +809,11 @@ +@@ -787,6 +816,11 @@ {"time-style", required_argument, NULL, TIME_STYLE_OPTION}, {"color", optional_argument, NULL, COLOR_OPTION}, {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION}, @@ -107,7 +107,7 @@ {"author", no_argument, NULL, AUTHOR_OPTION}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, -@@ -789,12 +823,19 @@ +@@ -796,12 +830,19 @@ static char const *const format_args[] = { "verbose", "long", "commas", "horizontal", "across", @@ -128,7 +128,7 @@ }; ARGMATCH_VERIFY (format_args, format_types); -@@ -1218,6 +1259,9 @@ +@@ -1246,6 +1287,9 @@ format_needs_stat = sort_type == sort_time || sort_type == sort_size || format == long_format @@ -138,7 +138,7 @@ || print_block_size; format_needs_type = (! format_needs_stat && (recursive -@@ -1248,7 +1292,7 @@ +@@ -1276,7 +1320,7 @@ } else do @@ -146,8 +146,8 @@ + gobble_file (argv[i++], command_line, NOT_AN_INODE_NUMBER, true, ""); while (i < argc); - if (files_index) -@@ -1411,6 +1455,9 @@ + if (cwd_n_used) +@@ -1439,6 +1483,9 @@ ignore_mode = IGNORE_DEFAULT; ignore_patterns = NULL; hide_patterns = NULL; @@ -157,7 +157,7 @@ /* FIXME: put this in a function. */ { -@@ -1486,7 +1533,7 @@ +@@ -1514,7 +1561,7 @@ } while ((c = getopt_long (argc, argv, @@ -166,7 +166,7 @@ long_options, NULL)) != -1) { switch (c) -@@ -1609,6 +1656,13 @@ +@@ -1637,6 +1684,13 @@ format = horizontal; break; @@ -180,7 +180,7 @@ case 'A': if (ignore_mode == IGNORE_DEFAULT) ignore_mode = IGNORE_DOT_AND_DOTDOT; -@@ -1789,6 +1843,25 @@ +@@ -1817,6 +1871,25 @@ case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); @@ -206,20 +206,21 @@ default: usage (LS_FAILURE); } -@@ -2485,6 +2558,12 @@ +@@ -2514,6 +2587,13 @@ + for (i = 0; i < cwd_n_used; i++) { - free (files[i].name); - free (files[i].linkname); + struct fileinfo *f = sorted_file[i]; +#ifdef WITH_SELINUX -+ if (files[i].scontext) { -+ freecon (files[i].scontext); -+ files[i].scontext=NULL; -+ } -+#endif ++ if (f->scontext) ++ { ++ freecon (f->scontext); ++ f->scontext = NULL; ++ } ++#endif /* SELINUX */ + free (f->name); + free (f->linkname); } - - files_index = 0; -@@ -2527,6 +2606,9 @@ +@@ -2558,6 +2638,9 @@ memset (f, '\0', sizeof *f); f->stat.st_ino = inode; f->filetype = type; @@ -229,7 +230,7 @@ if (command_line_arg || format_needs_stat -@@ -2574,6 +2656,11 @@ +@@ -2606,6 +2689,11 @@ { case DEREF_ALWAYS: err = stat (absolute_name, &f->stat); @@ -241,7 +242,7 @@ break; case DEREF_COMMAND_LINE_ARGUMENTS: -@@ -2582,6 +2669,11 @@ +@@ -2614,6 +2702,11 @@ { bool need_lstat; err = stat (absolute_name, &f->stat); @@ -253,7 +254,7 @@ if (dereference == DEREF_COMMAND_LINE_ARGUMENTS) break; -@@ -2600,6 +2692,11 @@ +@@ -2632,6 +2725,11 @@ default: /* DEREF_NEVER */ err = lstat (absolute_name, &f->stat); @@ -265,7 +266,7 @@ break; } -@@ -2622,7 +2719,11 @@ +@@ -2654,7 +2752,11 @@ f->stat_ok = true; #if USE_ACL @@ -278,16 +279,16 @@ { int n = file_has_acl (absolute_name, &f->stat); f->have_acl = (0 < n); -@@ -3158,6 +3259,16 @@ +@@ -3207,6 +3309,16 @@ DIRED_PUTCHAR ('\n'); } break; + +#ifdef WITH_SELINUX + case security_format: -+ for (i = 0; i < files_index; i++) ++ for (i = 0; i < cwd_n_used; i++) + { -+ print_scontext_format (files + i); ++ print_scontext_format (sorted_file[i]); + DIRED_PUTCHAR ('\n'); + } + break; @@ -295,7 +296,7 @@ } } -@@ -3412,6 +3523,15 @@ +@@ -3461,6 +3573,15 @@ The latter is wrong when nlink_width is zero. */ p += strlen (p); @@ -311,7 +312,7 @@ DIRED_INDENT (); if (print_owner | print_group | print_author) -@@ -4351,6 +4471,16 @@ +@@ -4405,6 +4526,16 @@ -X sort alphabetically by entry extension\n\ -1 list one file per line\n\ "), stdout); @@ -328,7 +329,7 @@ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\n\ -@@ -4374,3 +4504,70 @@ +@@ -4428,3 +4559,70 @@ } exit (status); } @@ -399,8 +400,8 @@ + } +} +#endif ---- coreutils-6.7/src/cp.c.selinux 2006-12-06 11:04:22.000000000 +0000 -+++ coreutils-6.7/src/cp.c 2007-01-09 18:47:04.000000000 +0000 +--- coreutils-6.8+/src/cp.c.selinux 2007-02-04 09:52:39.000000000 +0000 ++++ coreutils-6.8+/src/cp.c 2007-03-01 15:52:06.000000000 +0000 @@ -51,6 +51,11 @@ #define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering" @@ -441,7 +442,7 @@ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); -@@ -736,6 +748,11 @@ +@@ -750,6 +762,11 @@ x->preserve_mode = false; x->preserve_timestamps = false; @@ -453,7 +454,7 @@ x->require_preserve = false; x->recursive = false; x->sparse_mode = SPARSE_AUTO; -@@ -763,18 +780,19 @@ +@@ -777,18 +794,19 @@ PRESERVE_TIMESTAMPS, PRESERVE_OWNERSHIP, PRESERVE_LINK, @@ -475,7 +476,7 @@ }; ARGMATCH_VERIFY (preserve_args, preserve_vals); -@@ -810,11 +828,16 @@ +@@ -824,11 +842,16 @@ x->preserve_links = on_off; break; @@ -492,7 +493,7 @@ break; default: -@@ -839,6 +862,9 @@ +@@ -853,6 +876,9 @@ bool copy_contents = false; char *target_directory = NULL; bool no_target_directory = false; @@ -502,7 +503,7 @@ initialize_main (&argc, &argv); program_name = argv[0]; -@@ -854,7 +880,11 @@ +@@ -868,7 +894,11 @@ we'll actually use backup_suffix_string. */ backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); @@ -514,7 +515,7 @@ long_opts, NULL)) != -1) { -@@ -865,12 +895,13 @@ +@@ -879,12 +909,13 @@ sparse_type_string, sparse_type); break; @@ -529,7 +530,7 @@ x.require_preserve = true; x.recursive = true; break; -@@ -945,6 +976,36 @@ +@@ -959,6 +990,36 @@ case 'R': x.recursive = true; break; @@ -566,9 +567,9 @@ case REPLY_OPTION: /* Deprecated */ x.interactive = XARGMATCH ("--reply", optarg, ---- coreutils-6.7/src/Makefile.am.selinux 2007-01-09 18:47:04.000000000 +0000 -+++ coreutils-6.7/src/Makefile.am 2007-01-09 18:47:04.000000000 +0000 -@@ -20,14 +20,14 @@ +--- coreutils-6.8+/src/Makefile.am.selinux 2007-03-01 15:52:06.000000000 +0000 ++++ coreutils-6.8+/src/Makefile.am 2007-03-01 15:52:06.000000000 +0000 +@@ -19,14 +19,14 @@ EXTRA_PROGRAMS = chroot df hostid nice pinky stty su runuser uname uptime users who bin_SCRIPTS = groups @@ -585,7 +586,7 @@ test true tty whoami yes \ base64 \ $(OPTIONAL_BIN_PROGS) $(DF_PROG) -@@ -61,9 +61,9 @@ +@@ -60,9 +60,9 @@ LDADD = ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a # for eaccess in lib/euidaccess.c. @@ -598,7 +599,7 @@ pathchk_LDADD = $(LDADD) $(LIB_EACCESS) rm_LDADD = $(LDADD) $(LIB_EACCESS) test_LDADD = $(LDADD) $(LIB_EACCESS) -@@ -72,12 +72,19 @@ +@@ -71,12 +71,19 @@ # for clock_gettime and fdatasync dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC) @@ -621,8 +622,8 @@ ## If necessary, add -lm to resolve use of pow in lib/strtod.c. sort_LDADD = $(LDADD) $(POW_LIB) $(LIB_GETHRXTIME) ---- coreutils-6.7/src/copy.h.selinux 2006-12-06 11:04:22.000000000 +0000 -+++ coreutils-6.7/src/copy.h 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/src/copy.h.selinux 2007-01-30 07:19:49.000000000 +0000 ++++ coreutils-6.8+/src/copy.h 2007-03-01 15:52:06.000000000 +0000 @@ -127,6 +127,10 @@ bool preserve_ownership; bool preserve_mode; @@ -634,8 +635,8 @@ /* Enabled for mv, and for cp by the --preserve=links option. If true, attempt to preserve in the destination files any ---- /dev/null 2007-01-10 09:33:30.042789464 +0000 -+++ coreutils-6.7/src/chcon.c 2007-01-09 18:47:05.000000000 +0000 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/src/chcon.c 2007-03-01 15:52:06.000000000 +0000 @@ -0,0 +1,421 @@ +/* chcontext -- change security context of a pathname */ + @@ -1058,8 +1059,8 @@ + freecon(ref_context); + exit (errors); +} ---- coreutils-6.7/src/mkdir.c.selinux 2006-10-22 17:54:15.000000000 +0100 -+++ coreutils-6.7/src/mkdir.c 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/src/mkdir.c.selinux 2007-01-14 15:41:28.000000000 +0000 ++++ coreutils-6.8+/src/mkdir.c 2007-03-01 15:52:06.000000000 +0000 @@ -35,11 +35,18 @@ #define AUTHORS "David MacKenzie" @@ -1124,8 +1125,8 @@ case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: ---- coreutils-6.7/src/stat.c.selinux 2006-11-27 10:25:51.000000000 +0000 -+++ coreutils-6.7/src/stat.c 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/src/stat.c.selinux 2007-03-01 06:51:46.000000000 +0000 ++++ coreutils-6.8+/src/stat.c 2007-03-01 15:52:06.000000000 +0000 @@ -55,6 +55,13 @@ # include #endif @@ -1417,8 +1418,8 @@ exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); } ---- coreutils-6.7/src/mkfifo.c.selinux 2006-10-22 17:54:15.000000000 +0100 -+++ coreutils-6.7/src/mkfifo.c 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/src/mkfifo.c.selinux 2007-01-14 15:41:28.000000000 +0000 ++++ coreutils-6.8+/src/mkfifo.c 2007-03-01 15:52:06.000000000 +0000 @@ -32,11 +32,18 @@ #define AUTHORS "David MacKenzie" @@ -1484,8 +1485,8 @@ case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: ---- coreutils-6.7/src/mknod.c.selinux 2006-10-22 17:54:15.000000000 +0100 -+++ coreutils-6.7/src/mknod.c 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/src/mknod.c.selinux 2007-01-14 15:41:28.000000000 +0000 ++++ coreutils-6.8+/src/mknod.c 2007-03-01 15:52:06.000000000 +0000 @@ -36,8 +36,15 @@ /* The name this program was run with. */ char *program_name; @@ -1546,8 +1547,8 @@ case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: ---- coreutils-6.7/src/id.c.selinux 2007-01-09 18:47:04.000000000 +0000 -+++ coreutils-6.7/src/id.c 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/src/id.c.selinux 2007-03-01 15:52:06.000000000 +0000 ++++ coreutils-6.8+/src/id.c 2007-03-01 15:52:06.000000000 +0000 @@ -37,6 +37,20 @@ int getugroups (); @@ -1678,8 +1679,8 @@ + } +#endif } ---- coreutils-6.7/src/mv.c.selinux 2006-10-23 10:09:10.000000000 +0100 -+++ coreutils-6.7/src/mv.c 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/src/mv.c.selinux 2007-01-30 07:19:49.000000000 +0000 ++++ coreutils-6.8+/src/mv.c 2007-03-01 15:52:06.000000000 +0000 @@ -33,6 +33,11 @@ #include "quote.h" #include "remove.h" @@ -1714,8 +1715,8 @@ /* FIXME: consider not calling getenv for SIMPLE_BACKUP_SUFFIX unless we'll actually use backup_suffix_string. */ backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); ---- /dev/null 2007-01-10 09:33:30.042789464 +0000 -+++ coreutils-6.7/src/runcon.c 2007-01-09 18:47:05.000000000 +0000 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/src/runcon.c 2007-03-01 15:52:06.000000000 +0000 @@ -0,0 +1,253 @@ +/* + * runcon [ context | @@ -1970,8 +1971,8 @@ + } + return 1; /* can't reach this statement.... */ +} ---- coreutils-6.7/src/copy.c.selinux 2006-12-07 07:01:16.000000000 +0000 -+++ coreutils-6.7/src/copy.c 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/src/copy.c.selinux 2007-03-01 06:51:46.000000000 +0000 ++++ coreutils-6.8+/src/copy.c 2007-03-01 15:52:06.000000000 +0000 @@ -53,6 +53,11 @@ #include "xreadlink.h" #include "yesno.h" @@ -2015,7 +2016,7 @@ if (dest_desc < 0 && x->unlink_dest_after_failed_open) { if (unlink (dst_name) != 0) -@@ -1520,6 +1549,32 @@ +@@ -1534,6 +1563,32 @@ In such cases, set this variable to zero. */ preserve_metadata = true; @@ -2048,7 +2049,7 @@ if (S_ISDIR (src_mode)) { struct dir_list *dir; -@@ -1595,7 +1650,13 @@ +@@ -1606,7 +1661,13 @@ /* Are we crossing a file system boundary? */ if (x->one_file_system && device != 0 && device != src_sb.st_dev) @@ -2063,7 +2064,7 @@ /* Copy the contents of the directory. */ -@@ -1740,6 +1801,11 @@ +@@ -1756,6 +1817,11 @@ } } @@ -2075,7 +2076,7 @@ /* There's no need to preserve timestamps or permissions. */ preserve_metadata = false; -@@ -1873,6 +1939,11 @@ +@@ -1889,6 +1955,11 @@ un_backup: @@ -2087,8 +2088,8 @@ /* We have failed to create the destination file. If we've just added a dev/ino entry via the remember_copied call above (i.e., unless we've just failed to create a hard link), ---- coreutils-6.7/src/install.c.selinux 2006-12-04 09:00:28.000000000 +0000 -+++ coreutils-6.7/src/install.c 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/src/install.c.selinux 2007-02-10 15:04:45.000000000 +0000 ++++ coreutils-6.8+/src/install.c 2007-03-01 15:52:06.000000000 +0000 @@ -49,6 +49,43 @@ # include #endif @@ -2251,9 +2252,9 @@ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ ---- coreutils-6.7/configure.ac.selinux 2007-01-09 18:47:02.000000000 +0000 -+++ coreutils-6.7/configure.ac 2007-01-09 18:47:05.000000000 +0000 -@@ -46,6 +46,13 @@ +--- coreutils-6.8+/configure.ac.selinux 2007-03-01 15:52:06.000000000 +0000 ++++ coreutils-6.8+/configure.ac 2007-03-01 15:52:06.000000000 +0000 +@@ -48,6 +48,13 @@ LIB_PAM="-ldl -lpam -lpam_misc" AC_SUBST(LIB_PAM)]) @@ -2267,8 +2268,8 @@ AC_CHECK_FUNCS(uname, OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uname\$(EXEEXT)" MAN="$MAN uname.1") ---- coreutils-6.7/man/stat.1.selinux 2006-12-07 22:45:45.000000000 +0000 -+++ coreutils-6.7/man/stat.1 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/man/stat.1.selinux 2007-03-01 07:05:38.000000000 +0000 ++++ coreutils-6.8+/man/stat.1 2007-03-01 15:52:06.000000000 +0000 @@ -28,6 +28,9 @@ \fB\-t\fR, \fB\-\-terse\fR print the information in terse form @@ -2289,15 +2290,15 @@ %D Device number in hex .TP ---- /dev/null 2007-01-10 09:33:30.042789464 +0000 -+++ coreutils-6.7/man/chcon.x 2007-01-09 18:47:05.000000000 +0000 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/man/chcon.x 2007-03-01 15:52:06.000000000 +0000 @@ -0,0 +1,4 @@ +[NAME] +chcon \- change file security context +[DESCRIPTION] +.\" Add any additional description here ---- /dev/null 2007-01-10 09:33:30.042789464 +0000 -+++ coreutils-6.7/man/chcon.1 2007-01-09 18:47:05.000000000 +0000 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/man/chcon.1 2007-03-01 15:52:06.000000000 +0000 @@ -0,0 +1,64 @@ +.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands" +.SH NAME @@ -2363,9 +2364,9 @@ +.B info chcon +.PP +should give you access to the complete manual. ---- coreutils-6.7/man/dir.1.selinux 2006-12-07 22:45:41.000000000 +0000 -+++ coreutils-6.7/man/dir.1 2007-01-09 18:47:05.000000000 +0000 -@@ -204,6 +204,20 @@ +--- coreutils-6.8+/man/dir.1.selinux 2007-03-01 07:05:37.000000000 +0000 ++++ coreutils-6.8+/man/dir.1 2007-03-01 15:52:06.000000000 +0000 +@@ -205,6 +205,20 @@ .TP \fB\-1\fR list one file per line @@ -2386,8 +2387,8 @@ .TP \fB\-\-help\fR display this help and exit ---- coreutils-6.7/man/mkfifo.1.selinux 2006-12-07 22:45:43.000000000 +0000 -+++ coreutils-6.7/man/mkfifo.1 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/man/mkfifo.1.selinux 2007-02-27 12:41:10.000000000 +0000 ++++ coreutils-6.8+/man/mkfifo.1 2007-03-01 15:52:06.000000000 +0000 @@ -12,6 +12,9 @@ .PP Mandatory arguments to long options are mandatory for short options too. @@ -2398,9 +2399,9 @@ \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR set file permission bits to MODE, not a=rw \- umask .TP ---- coreutils-6.7/man/Makefile.am.selinux 2007-01-09 18:47:04.000000000 +0000 -+++ coreutils-6.7/man/Makefile.am 2007-01-09 18:47:05.000000000 +0000 -@@ -30,7 +30,7 @@ +--- coreutils-6.8+/man/Makefile.am.selinux 2007-03-01 15:52:06.000000000 +0000 ++++ coreutils-6.8+/man/Makefile.am 2007-03-01 15:52:06.000000000 +0000 +@@ -29,7 +29,7 @@ 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 \ @@ -2409,7 +2410,7 @@ optional_mans = \ chroot.1 hostid.1 nice.1 pinky.1 stty.1 uname.1 uptime.1 users.1 who.1 -@@ -142,6 +142,8 @@ +@@ -141,6 +141,8 @@ who.1: $(common_dep) $(srcdir)/who.x ../src/who.c whoami.1: $(common_dep) $(srcdir)/whoami.x ../src/whoami.c yes.1: $(common_dep) $(srcdir)/yes.x ../src/yes.c @@ -2418,8 +2419,8 @@ SUFFIXES = .x .1 ---- coreutils-6.7/man/cp.1.selinux 2006-12-07 22:45:41.000000000 +0000 -+++ coreutils-6.7/man/cp.1 2007-01-09 18:47:05.000000000 +0000 +--- coreutils-6.8+/man/cp.1.selinux 2007-02-27 12:41:07.000000000 +0000 ++++ coreutils-6.8+/man/cp.1 2007-03-01 15:52:06.000000000 +0000 @@ -57,7 +57,7 @@ .TP \fB\-\-preserve\fR[=\fIATTR_LIST\fR] @@ -2439,8 +2440,8 @@ \fB\-\-version\fR output version information and exit .PP ---- coreutils-6.7/man/id.1.selinux 2006-12-07 22:45:42.000000000 +0000 -+++ coreutils-6.7/man/id.1 2007-01-09 18:47:06.000000000 +0000 +--- coreutils-6.8+/man/id.1.selinux 2007-02-27 12:41:09.000000000 +0000 ++++ coreutils-6.8+/man/id.1 2007-03-01 15:52:06.000000000 +0000 @@ -13,6 +13,9 @@ \fB\-a\fR ignore, for compatibility with other versions @@ -2451,8 +2452,8 @@ \fB\-g\fR, \fB\-\-group\fR print only the effective group ID .TP ---- /dev/null 2007-01-10 09:33:30.042789464 +0000 -+++ coreutils-6.7/man/runcon.x 2007-01-09 18:47:06.000000000 +0000 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/man/runcon.x 2007-03-01 15:52:06.000000000 +0000 @@ -0,0 +1,14 @@ +[NAME] +runcon \- run command with specified security context @@ -2468,8 +2469,8 @@ +.PP +Note that only carefully-chosen contexts are likely to successfully +run. ---- /dev/null 2007-01-10 09:33:30.042789464 +0000 -+++ coreutils-6.7/man/runcon.1 2007-01-09 18:47:06.000000000 +0000 +--- /dev/null 2007-03-01 09:16:39.219409909 +0000 ++++ coreutils-6.8+/man/runcon.1 2007-03-01 15:52:06.000000000 +0000 @@ -0,0 +1,45 @@ +.TH RUNCON "1" "February 2005" "runcon (coreutils) 5.0" "selinux" +.SH NAME @@ -2516,8 +2517,8 @@ +.PP +Note that only carefully-chosen contexts are likely to successfully +run. ---- coreutils-6.7/man/mknod.1.selinux 2006-12-07 22:45:43.000000000 +0000 -+++ coreutils-6.7/man/mknod.1 2007-01-09 18:47:06.000000000 +0000 +--- coreutils-6.8+/man/mknod.1.selinux 2007-02-27 12:41:10.000000000 +0000 ++++ coreutils-6.8+/man/mknod.1 2007-03-01 15:52:06.000000000 +0000 @@ -12,6 +12,9 @@ .PP Mandatory arguments to long options are mandatory for short options too. @@ -2528,9 +2529,9 @@ \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR set file permission bits to MODE, not a=rw \- umask .TP ---- 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:47:06.000000000 +0000 -@@ -204,6 +204,20 @@ +--- coreutils-6.8+/man/ls.1.selinux 2007-03-01 07:05:38.000000000 +0000 ++++ coreutils-6.8+/man/ls.1 2007-03-01 15:52:06.000000000 +0000 +@@ -205,6 +205,20 @@ .TP \fB\-1\fR list one file per line @@ -2551,8 +2552,8 @@ .TP \fB\-\-help\fR display this help and exit ---- 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:47:06.000000000 +0000 +--- coreutils-6.8+/man/mkdir.1.selinux 2007-02-27 12:41:10.000000000 +0000 ++++ coreutils-6.8+/man/mkdir.1 2007-03-01 15:52:06.000000000 +0000 @@ -12,6 +12,8 @@ .PP Mandatory arguments to long options are mandatory for short options too. @@ -2562,9 +2563,9 @@ \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:47:06.000000000 +0000 -@@ -204,6 +204,20 @@ +--- coreutils-6.8+/man/vdir.1.selinux 2007-03-01 07:05:38.000000000 +0000 ++++ coreutils-6.8+/man/vdir.1 2007-03-01 15:52:06.000000000 +0000 +@@ -205,6 +205,20 @@ .TP \fB\-1\fR list one file per line @@ -2585,9 +2586,9 @@ .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:47:06.000000000 +0000 -@@ -66,6 +66,11 @@ +--- coreutils-6.8+/man/install.1.selinux 2007-02-27 12:41:09.000000000 +0000 ++++ coreutils-6.8+/man/install.1 2007-03-01 15:52:06.000000000 +0000 +@@ -67,6 +67,11 @@ .TP \fB\-v\fR, \fB\-\-verbose\fR print the name of each directory as it is created @@ -2599,8 +2600,8 @@ .TP \fB\-\-help\fR display this help and exit ---- coreutils-6.7/README.selinux 2007-01-09 18:47:04.000000000 +0000 -+++ coreutils-6.7/README 2007-01-09 18:47:06.000000000 +0000 +--- coreutils-6.8+/README.selinux 2007-03-01 15:52:06.000000000 +0000 ++++ coreutils-6.8+/README 2007-03-01 15:52:06.000000000 +0000 @@ -7,11 +7,11 @@ The programs that can be built with this package are: Index: coreutils.spec =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- coreutils.spec 22 Feb 2007 09:29:52 -0000 1.165 +++ coreutils.spec 1 Mar 2007 17:36:24 -0000 1.166 @@ -1,12 +1,13 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils -Version: 6.7 -Release: 9%{?dist} +Version: 6.8 +Release: 1%{?dist} License: GPL Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 +#Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://meyering.net/cu/%{name}-%{version}+-ss-2007-03-01.11.42.23+0.tar.gz Source101: coreutils-DIR_COLORS Source102: coreutils-DIR_COLORS.xterm Source105: coreutils-colorls.sh @@ -39,6 +40,7 @@ Patch908: coreutils-getgrouplist.patch Patch912: coreutils-overflow.patch Patch915: coreutils-split-pam.patch +Patch916: coreutils-getfacl-exit-code.patch #SELINUX Patch Patch950: coreutils-selinux.patch @@ -77,7 +79,7 @@ the old GNU fileutils, sh-utils, and textutils packages. %prep -%setup -q +%setup -q -n %{name}-%{version}+ # From upstream @@ -100,6 +102,7 @@ %patch908 -p1 -b .getgrouplist %patch912 -p1 -b .overflow %patch915 -p1 -b .splitl +%patch916 -p1 -b .getfacl-exit-code #SELinux %patch950 -p1 -b .selinux @@ -264,6 +267,9 @@ /sbin/runuser %changelog +* Thu Mar 1 2007 Tim Waugh +- 6.8+, in preparation for 6.9. + * Thu Feb 22 2007 Tim Waugh 6.7-9 - Use sed instead of perl for text replacement (bug #225655). - Use install-info scriptlets from the guidelines (bug #225655). Index: sources =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Feb 2007 10:15:52 -0000 1.13 +++ sources 1 Mar 2007 17:36:24 -0000 1.14 @@ -1 +1 @@ -a16465d0856cd011a1acc1c21040b7f4 coreutils-6.7.tar.bz2 +36b5190ccdde4d526ebb1efd42aedf6f coreutils-6.8+-ss-2007-03-01.11.42.23+0.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 1 18:19:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 13:19:51 -0500 Subject: rpms/byacc/devel byacc.spec,1.1,1.2 Message-ID: <200703011819.l21IJpFs009060@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/byacc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9043 Modified Files: byacc.spec Log Message: Cleanup. Index: byacc.spec =================================================================== RCS file: /cvs/dist/rpms/byacc/devel/byacc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- byacc.spec 2 Feb 2007 14:42:21 -0000 1.1 +++ byacc.spec 1 Mar 2007 18:19:49 -0000 1.2 @@ -7,7 +7,7 @@ License: Public Domain Group: Development/Tools URL: http://dickey.his.com/byacc/byacc.html -Source: ftp://invisible-island.net/byacc/byacc-20050813.tgz +Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -22,13 +22,15 @@ %build %configure --disable-dependency-tracking -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -ln -s yacc $RPM_BUILD_ROOT/usr/bin/byacc +ln -s yacc $RPM_BUILD_ROOT/%{_bindir}/byacc ln -s yacc.1 $RPM_BUILD_ROOT/%{_mandir}/man1/byacc.1 +install -d $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/ +install -m 644 ACKNOWLEDGEMENTS CHANGES README NEW_FEATURES $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/ %check echo ====================TESTING========================= @@ -39,9 +41,10 @@ rm -rf $RPM_BUILD_ROOT %files +%doc ACKNOWLEDGEMENTS CHANGES README NEW_FEATURES %defattr(-,root,root) -/usr/bin/yacc -/usr/bin/byacc +%{_bindir}/yacc +%{_bindir}/byacc %{_mandir}/man1/yacc.1* %{_mandir}/man1/byacc.1* From fedora-cvs-commits at redhat.com Thu Mar 1 18:36:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 13:36:43 -0500 Subject: rpms/parted/FC-5 .cvsignore, 1.25, 1.26 parted.spec, 1.70, 1.71 sources, 1.29, 1.30 Message-ID: <200703011836.l21IahIn026284@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/parted/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv26224 Modified Files: .cvsignore parted.spec sources Log Message: * Thu Mar 01 2007 David Cantrell - 1.8.2-1 - Upgrade to GNU parted-1.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/parted/FC-5/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 7 Dec 2006 18:10:22 -0000 1.25 +++ .cvsignore 1 Mar 2007 18:36:37 -0000 1.26 @@ -1 +1 @@ -parted-1.8.1.tar.bz2 +parted-1.8.2.tar.bz2 Index: parted.spec =================================================================== RCS file: /cvs/dist/rpms/parted/FC-5/parted.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- parted.spec 7 Dec 2006 18:10:22 -0000 1.70 +++ parted.spec 1 Mar 2007 18:36:38 -0000 1.71 @@ -3,7 +3,7 @@ Summary: The GNU disk partition manipulation program. Name: parted -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ %{_libdir}/*.so %changelog +* Thu Mar 01 2007 David Cantrell - 1.8.2-1 +- Upgrade to GNU parted-1.8.2 + * Thu Dec 07 2006 David Cantrell - 1.8.1-1 - Upgrade to GNU parted-1.8.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/parted/FC-5/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 7 Dec 2006 18:10:22 -0000 1.29 +++ sources 1 Mar 2007 18:36:38 -0000 1.30 @@ -1 +1 @@ -c430b38fd5f3c7530e2c3a3bdf605a29 parted-1.8.1.tar.bz2 +f29d377592273fd3e874ebe6d492a93c parted-1.8.2.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 1 18:48:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 13:48:21 -0500 Subject: rpms/parted/FC-6 .cvsignore, 1.27, 1.28 parted.spec, 1.90, 1.91 sources, 1.31, 1.32 Message-ID: <200703011848.l21ImLqE003420@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/parted/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2586 Modified Files: .cvsignore parted.spec sources Log Message: * Thu Mar 01 2007 David Cantrell - 1.8.2-1 - Upgrade to GNU parted-1.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/parted/FC-6/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 7 Dec 2006 18:34:59 -0000 1.27 +++ .cvsignore 1 Mar 2007 18:48:14 -0000 1.28 @@ -1 +1 @@ -parted-1.8.1.tar.bz2 +parted-1.8.2.tar.bz2 Index: parted.spec =================================================================== RCS file: /cvs/dist/rpms/parted/FC-6/parted.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- parted.spec 7 Dec 2006 18:34:59 -0000 1.90 +++ parted.spec 1 Mar 2007 18:48:14 -0000 1.91 @@ -3,7 +3,7 @@ Summary: The GNU disk partition manipulation program. Name: parted -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ %{_libdir}/*.so %changelog +* Thu Mar 01 2007 David Cantrell - 1.8.2-1 +- Upgrade to GNU parted-1.8.2 + * Thu Dec 07 2006 David Cantrell - 1.8.1-1 - Upgrade to GNU parted-1.8.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/parted/FC-6/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 7 Dec 2006 18:34:59 -0000 1.31 +++ sources 1 Mar 2007 18:48:14 -0000 1.32 @@ -1 +1 @@ -c430b38fd5f3c7530e2c3a3bdf605a29 parted-1.8.1.tar.bz2 +f29d377592273fd3e874ebe6d492a93c parted-1.8.2.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 1 19:36:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 14:36:01 -0500 Subject: rpms/dhcp/FC-6 dhcp.spec,1.117,1.118 Message-ID: <200703011936.l21Ja1MK019254@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19240 Modified Files: dhcp.spec Log Message: * Thu Mar 01 2007 David Cantrell - 12:3.0.5-2 - Include contrib/ subdirectory in /usr/share/doc (#230476) - Remove invalid ja_JP.eucJP man pages from /usr/share/doc Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/FC-6/dhcp.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- dhcp.spec 29 Nov 2006 16:28:55 -0000 1.117 +++ dhcp.spec 1 Mar 2007 19:35:55 -0000 1.118 @@ -8,7 +8,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 12 License: distributable Group: System Environment/Daemons @@ -284,7 +284,8 @@ %files %defattr(-,root,root) -%doc README RELNOTES dhcpd.conf.sample doc/* +%doc README README.ldap RELNOTES dhcpd.conf.sample doc/IANA-arp-parameters +%doc doc/IANA-arp-parameters doc/api+protocol doc/*.txt contrib %dir %{_localstatedir}/lib/dhcpd %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd.leases %config(noreplace) /etc/sysconfig/dhcpd @@ -340,6 +341,10 @@ %{_libdir}/libdhcp4client.so %changelog +* Thu Mar 01 2007 David Cantrell - 12:3.0.5-2 +- Include contrib/ subdirectory in /usr/share/doc (#230476) +- Remove invalid ja_JP.eucJP man pages from /usr/share/doc + * Wed Nov 29 2006 David Cantrell - 12:3.0.5-1 - Upgrade to ISC dhcp-3.0.5 - Roll md5 patch in to libdhcp4client patch since it's related From fedora-cvs-commits at redhat.com Thu Mar 1 19:49:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 14:49:27 -0500 Subject: rpms/dhcp/FC-6 dhcp.spec,1.118,1.119 Message-ID: <200703011949.l21JnRZ1012671@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv12657 Modified Files: dhcp.spec Log Message: * Thu Mar 01 2007 David Cantrell - 12:3.0.5-2 - Include contrib/ subdirectory in /usr/share/doc (#230476) - Remove invalid ja_JP.eucJP man pages from /usr/share/doc Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/FC-6/dhcp.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- dhcp.spec 1 Mar 2007 19:35:55 -0000 1.118 +++ dhcp.spec 1 Mar 2007 19:49:25 -0000 1.119 @@ -284,7 +284,7 @@ %files %defattr(-,root,root) -%doc README README.ldap RELNOTES dhcpd.conf.sample doc/IANA-arp-parameters +%doc README RELNOTES dhcpd.conf.sample doc/IANA-arp-parameters %doc doc/IANA-arp-parameters doc/api+protocol doc/*.txt contrib %dir %{_localstatedir}/lib/dhcpd %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd.leases From fedora-cvs-commits at redhat.com Thu Mar 1 20:14:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 15:14:39 -0500 Subject: rpms/ConsoleKit/devel .cvsignore, 1.2, 1.3 ConsoleKit.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200703012014.l21KEdbL013328@cvs.devel.redhat.com> Author: davidz Update of /cvs/dist/rpms/ConsoleKit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13310 Modified Files: .cvsignore ConsoleKit.spec sources Log Message: * Thu Mar 1 2007 David Zeuthen - 0.1.3-0.git20070301 - Update to git snapshot - Drop all patches as they are committed upstream - New tool ck-list-sessions - New -libs subpackage with run-time libraries and a PAM module - New -devel subpackage with headers Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ConsoleKit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jan 2007 19:33:19 -0000 1.2 +++ .cvsignore 1 Mar 2007 20:14:37 -0000 1.3 @@ -1 +1,2 @@ console-kit-0.1.0.tar.gz +ConsoleKit-0.1.3.git20070301.tar.gz Index: ConsoleKit.spec =================================================================== RCS file: /cvs/dist/rpms/ConsoleKit/devel/ConsoleKit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ConsoleKit.spec 7 Feb 2007 02:09:24 -0000 1.2 +++ ConsoleKit.spec 1 Mar 2007 20:14:37 -0000 1.3 @@ -4,17 +4,12 @@ Summary: System daemon for tracking users, sessions and seats Name: ConsoleKit -Version: 0.1.0 -Release: 5%{?dist} +Version: 0.1.3 +Release: 0.git20070301%{?dist} License: GPL Group: System Environment/Libraries URL: http://consolekit.freedesktop.org -Source0: http://people.freedesktop.org/~mccann/dist/console-kit-%{version}.tar.gz -Patch0: ConsoleKit-0.1.0-servicename.patch -Patch1: ConsoleKit-0.1.0-startup-priority.patch -Patch2: ConsoleKit-0.1.0-minimize-stack.patch -Patch3: ConsoleKit-0.1.0-active-session.patch - +Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.git20070301.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: dbus >= %{dbus_version} @@ -22,6 +17,7 @@ BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} +BuildRequires: pam-devel Requires(post): chkconfig Requires(preun): chkconfig @@ -33,15 +29,29 @@ It provides asynchronous notification via the system message bus. +%package libs +Summary: ConsoleKit libraries +Group: Development/Libraries +Requires: pam +Requires: dbus >= %{dbus_version} + +%description libs +Libraries and a PAM module for interacting with ConsoleKit. + +%package devel +Summary: Development libraries and headers for ConsoleKit +Group: Development/Libraries +Requires: dbus-devel >= %{dbus_version} +Requires: pkgconfig + +%description devel +Headers, libraries and API docs for ConsoleKit + %prep -%setup -q -n console-kit-%{version} -%patch0 -p1 -b .servicename -%patch1 -p1 -b .startup-priority -%patch2 -p1 -b .minimize-stack -%patch3 -p1 -b .active-session +%setup -q %build -%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid +%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module make @@ -49,6 +59,11 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT/lib/*.a +rm -f $RPM_BUILD_ROOT/lib/*.la +rm -f $RPM_BUILD_ROOT/lib/security/*.a +rm -f $RPM_BUILD_ROOT/lib/security/*.la + %clean rm -rf $RPM_BUILD_ROOT @@ -70,9 +85,30 @@ %{_sysconfdir}/dbus-1/system.d/* %{_sysconfdir}/rc.d/init.d/ConsoleKit %{_sbindir}/console-kit-daemon +%{_bindir}/ck-list-sessions + +%files libs +%defattr(-,root,root,-) +/lib/lib*.so.* +/lib/security/*.so +%{_datadir}/man/man8/pam_ck_connector.8.gz + +%files devel +%defattr(-,root,root,-) + +/lib/lib*.so +%{_libdir}/pkgconfig/* +%{_includedir}/* %changelog +* Thu Mar 1 2007 David Zeuthen - 0.1.3-0.git20070301 +- Update to git snapshot +- Drop all patches as they are committed upstream +- New tool ck-list-sessions +- New -libs subpackage with run-time libraries and a PAM module +- New -devel subpackage with headers + * Tue Feb 6 2007 David Zeuthen - 0.1.0-5%{?dist} - Start ConsoleKit a bit earlier so it starts before HAL (98 -> 90) - Minimize stack usage so VIRT size is more reasonable (mclasen) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ConsoleKit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jan 2007 19:33:19 -0000 1.2 +++ sources 1 Mar 2007 20:14:37 -0000 1.3 @@ -1 +1 @@ -5d0a8492cb114b66ed5182fb6d59929b console-kit-0.1.0.tar.gz +2d2b18c8b3ef3d2c8e7c915414324706 ConsoleKit-0.1.3.git20070301.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 1 21:10:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 16:10:00 -0500 Subject: rpms/mcstrans/devel .cvsignore, 1.15, 1.16 mcstrans.spec, 1.28, 1.29 sources, 1.18, 1.19 Message-ID: <200703012110.l21LA0qa010580@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/mcstrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10539 Modified Files: .cvsignore mcstrans.spec sources Log Message: * Thu Mar 1 2007 Dan Walsh 0.2.5-1 - Fix case where s0="" Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mcstrans/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 26 Feb 2007 15:49:17 -0000 1.15 +++ .cvsignore 1 Mar 2007 21:09:58 -0000 1.16 @@ -12,3 +12,4 @@ mcstrans-0.2.2.tgz mcstrans-0.2.3.tgz mcstrans-0.2.4.tgz +mcstrans-0.2.5.tgz Index: mcstrans.spec =================================================================== RCS file: /cvs/dist/rpms/mcstrans/devel/mcstrans.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mcstrans.spec 26 Feb 2007 15:50:01 -0000 1.28 +++ mcstrans.spec 1 Mar 2007 21:09:58 -0000 1.29 @@ -1,6 +1,6 @@ Summary: SELinux Translation Daemon Name: mcstrans -Version: 0.2.4 +Version: 0.2.5 Release: 1%{?dist} License: GPL Group: System Environment/Daemons @@ -70,6 +70,9 @@ %{_sysconfdir}/rc.d/init.d/mcstrans %changelog +* Thu Mar 1 2007 Dan Walsh 0.2.5-1 +- Fix case where s0="" + * Mon Feb 26 2007 Dan Walsh 0.2.4-1 - Translate range if fully specified correctly Index: sources =================================================================== RCS file: /cvs/dist/rpms/mcstrans/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 26 Feb 2007 15:49:17 -0000 1.18 +++ sources 1 Mar 2007 21:09:58 -0000 1.19 @@ -1 +1 @@ -df2f20daf0e9b0bf66d54c8279dc8dd1 mcstrans-0.2.4.tgz +64d7b1938b25d3eaae211e15777b1794 mcstrans-0.2.5.tgz From fedora-cvs-commits at redhat.com Thu Mar 1 21:15:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 16:15:51 -0500 Subject: rpms/pyparted/FC-5 .cvsignore, 1.10, 1.11 pyparted.spec, 1.23, 1.24 sources, 1.13, 1.14 Message-ID: <200703012115.l21LFpvP015245@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/pyparted/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv15198 Modified Files: .cvsignore pyparted.spec sources Log Message: * Thu Mar 01 2007 David Cantrell - 1.8.5-1 - Upgrade to pyparted-1.8.5 - Require parted >= 1.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pyparted/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 8 Dec 2006 00:02:48 -0000 1.10 +++ .cvsignore 1 Mar 2007 21:15:49 -0000 1.11 @@ -1 +1 @@ -pyparted-1.8.1.tar.gz +pyparted-1.8.5.tar.gz Index: pyparted.spec =================================================================== RCS file: /cvs/dist/rpms/pyparted/FC-5/pyparted.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- pyparted.spec 8 Dec 2006 00:02:48 -0000 1.23 +++ pyparted.spec 1 Mar 2007 21:15:49 -0000 1.24 @@ -1,6 +1,6 @@ Summary: Python module for GNU parted Name: pyparted -Version: 1.8.1 +Version: 1.8.5 Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -8,8 +8,8 @@ Source0: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python-devel, parted-devel >= 1.8.1 -Requires: parted >= 1.8.1 +BuildRequires: python-devel, parted-devel >= 1.8.2 +Requires: parted >= 1.8.2 %description Python modules for the parted library. It is used for manipulation @@ -41,6 +41,10 @@ %{_libdir}/python?.?/site-packages/*.so %changelog +* Thu Mar 01 2007 David Cantrell - 1.8.5-1 +- Upgrade to pyparted-1.8.5 +- Require parted >= 1.8.2 + * Thu Dec 07 2006 David Cantrell - 1.8.1-1 - Upgrade to pyparted-1.8.1 - Determine Python version to use in %%build so the source RPM is more Index: sources =================================================================== RCS file: /cvs/dist/rpms/pyparted/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Dec 2006 00:02:48 -0000 1.13 +++ sources 1 Mar 2007 21:15:49 -0000 1.14 @@ -1 +1 @@ -96806167072325ef52eb7bae4db52653 pyparted-1.8.1.tar.gz +9097bc19e06350d865db38016ef98f4c pyparted-1.8.5.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 1 21:19:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 16:19:24 -0500 Subject: rpms/dejavu-lgc-fonts/devel .cvsignore, 1.6, 1.7 dejavu-lgc-fonts.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200703012119.l21LJOd7010846@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/dejavu-lgc-fonts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8565 Modified Files: .cvsignore dejavu-lgc-fonts.spec sources Log Message: * Thu Mar 01 2007 Behdad Esfahbod - 2.15-1 - Update to 2.15 - Define fontconffile and use it Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Jan 2007 21:11:33 -0000 1.6 +++ .cvsignore 1 Mar 2007 21:19:22 -0000 1.7 @@ -1 +1 @@ -dejavu-lgc-ttf-2.13.tar.bz2 +dejavu-lgc-ttf-2.15.tar.bz2 Index: dejavu-lgc-fonts.spec =================================================================== RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/dejavu-lgc-fonts.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dejavu-lgc-fonts.spec 30 Jan 2007 02:39:22 -0000 1.10 +++ dejavu-lgc-fonts.spec 1 Mar 2007 21:19:22 -0000 1.11 @@ -4,7 +4,7 @@ %define fontconffile %{fontconfdir}/59-%{name}.conf Name: dejavu-lgc-fonts -Version: 2.13 +Version: 2.15 Release: 1 Summary: DejaVu LGC Fonts Group: User Interface/X @@ -62,6 +62,8 @@ %changelog +* Thu Mar 01 2007 Behdad Esfahbod - 2.15-1 +- Update to 2.15 - Define fontconffile and use it * Tue Jan 09 2007 Behdad Esfahbod - 2.13-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Jan 2007 21:11:33 -0000 1.6 +++ sources 1 Mar 2007 21:19:22 -0000 1.7 @@ -1 +1 @@ -16ea0af8f6f009b52f21ffefb9bc19a8 dejavu-lgc-ttf-2.13.tar.bz2 +b3b685e5885117ca4c7057b99174c343 dejavu-lgc-ttf-2.15.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 1 21:19:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 16:19:49 -0500 Subject: rpms/pyparted/FC-6 .cvsignore, 1.12, 1.13 pyparted.spec, 1.27, 1.28 sources, 1.15, 1.16 Message-ID: <200703012119.l21LJnRK011211@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/pyparted/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11162 Modified Files: .cvsignore pyparted.spec sources Log Message: * Thu Mar 01 2007 David Cantrell - 1.8.5-1 - Upgrade to pyparted-1.8.5 - Require parted >= 1.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pyparted/FC-6/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 8 Dec 2006 04:02:52 -0000 1.12 +++ .cvsignore 1 Mar 2007 21:19:47 -0000 1.13 @@ -1 +1 @@ -pyparted-1.8.1.tar.gz +pyparted-1.8.5.tar.gz Index: pyparted.spec =================================================================== RCS file: /cvs/dist/rpms/pyparted/FC-6/pyparted.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- pyparted.spec 8 Dec 2006 04:02:52 -0000 1.27 +++ pyparted.spec 1 Mar 2007 21:19:47 -0000 1.28 @@ -1,6 +1,6 @@ Summary: Python module for GNU parted Name: pyparted -Version: 1.8.1 +Version: 1.8.5 Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -8,8 +8,8 @@ Source0: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python-devel, parted-devel >= 1.8.1 -Requires: parted >= 1.8.1 +BuildRequires: python-devel, parted-devel >= 1.8.2 +Requires: parted >= 1.8.2 %description Python modules for the parted library. It is used for manipulation @@ -41,6 +41,10 @@ %{_libdir}/python?.?/site-packages/*.so %changelog +* Thu Mar 01 2007 David Cantrell - 1.8.5-1 +- Upgrade to pyparted-1.8.5 +- Require parted >= 1.8.2 + * Thu Dec 07 2006 David Cantrell - 1.8.1-1 - Upgrade to pyparted-1.8.1 - Determine Python version to use in %%build so the source RPM is more Index: sources =================================================================== RCS file: /cvs/dist/rpms/pyparted/FC-6/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 8 Dec 2006 04:02:52 -0000 1.15 +++ sources 1 Mar 2007 21:19:47 -0000 1.16 @@ -1 +1 @@ -96806167072325ef52eb7bae4db52653 pyparted-1.8.1.tar.gz +9097bc19e06350d865db38016ef98f4c pyparted-1.8.5.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 1 21:32:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 16:32:07 -0500 Subject: rpms/libart_lgpl/devel libart-2.3.19-header.patch, NONE, 1.1 libart_lgpl.spec, 1.18, 1.19 Message-ID: <200703012132.l21LW71n020686@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/libart_lgpl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20603 Modified Files: libart_lgpl.spec Added Files: libart-2.3.19-header.patch Log Message: * Thu Mar 01 2007 Behdad Esfahbod - 2.3.19-2 - Add upstreamed patch libart-2.3.19-header.patch - Resolves: #230571 libart-2.3.19-header.patch: art_misc.h | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE libart-2.3.19-header.patch --- --- libart_lgpl-2.3.19/art_misc.h.extern-c 2007-01-02 00:59:22.000000000 +0100 +++ libart_lgpl-2.3.19/art_misc.h 2007-03-01 09:19:06.000000000 +0100 @@ -34,9 +34,15 @@ #include #endif +#ifdef __cplusplus +extern "C" { +#endif void *art_alloc(size_t size); void art_free(void *ptr); void *art_realloc(void *ptr, size_t size); +#ifdef __cplusplus +} +#endif /* __cplusplus */ /* These aren't, strictly speaking, configuration macros, but they're damn handy to have around, and may be worth playing with for Index: libart_lgpl.spec =================================================================== RCS file: /cvs/dist/rpms/libart_lgpl/devel/libart_lgpl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libart_lgpl.spec 28 Feb 2007 13:54:12 -0000 1.18 +++ libart_lgpl.spec 1 Mar 2007 21:32:05 -0000 1.19 @@ -1,10 +1,11 @@ Summary: Library of graphics routines used by libgnomecanvas Name: libart_lgpl Version: 2.3.19 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org/ Source0: http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/%{name}-%{version}.tar.bz2 Patch0: libart-multilib.patch +Patch1: libart-2.3.19-header.patch License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +29,7 @@ %prep %setup -q %patch0 -p1 -b .multilib +%patch1 -p1 -b .header %build %configure --disable-static @@ -89,6 +91,10 @@ %{_includedir}/* %changelog +* Thu Mar 01 2007 Behdad Esfahbod - 2.3.19-2 +- Add upstreamed patch libart-2.3.19-header.patch +- Resolves: #230571 + * Wed Feb 28 2007 Matthias Clasen - 2.3.19-1 - Update to 2.3.19 From fedora-cvs-commits at redhat.com Thu Mar 1 21:51:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 16:51:45 -0500 Subject: rpms/thunderbird/FC-6 firefox-1.5.0.10-nss-system-nspr.patch, NONE, 1.1 firefox-1.5.0.10-with-system-nss.patch, NONE, 1.1 firefox-1.5-pango-printing.patch, 1.3, 1.4 sources, 1.20, 1.21 thunderbird.spec, 1.93, 1.94 firefox-1.1-nss-system-nspr.patch, 1.1, NONE firefox-1.5-with-system-nss.patch, 1.1, NONE Message-ID: <200703012151.l21LpjRU011980@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/thunderbird/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11960 Modified Files: firefox-1.5-pango-printing.patch sources thunderbird.spec Added Files: firefox-1.5.0.10-nss-system-nspr.patch firefox-1.5.0.10-with-system-nss.patch Removed Files: firefox-1.1-nss-system-nspr.patch firefox-1.5-with-system-nss.patch Log Message: Update to 1.5.0.10 firefox-1.5.0.10-nss-system-nspr.patch: coreconf/location.mk | 2 ++ manager/Makefile.in | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) --- NEW FILE firefox-1.5.0.10-nss-system-nspr.patch --- --- mozilla/security/coreconf/location.mk.old 2007-02-13 21:41:48.000000000 +0100 +++ mozilla/security/coreconf/location.mk 2007-02-15 16:52:03.000000000 +0100 @@ -61,6 +61,8 @@ DIST = $(SOURCE_PREFIX)/$(PLATFORM) +NSPR_LIBDIR = $(DIST)/lib + ifdef BUILD_DEBUG_GC DEFINES += -DDEBUG_GC endif --- mozilla/security/manager/Makefile.in.old 2007-02-13 21:43:11.000000000 +0100 +++ mozilla/security/manager/Makefile.in 2007-02-16 13:58:31.000000000 +0100 @@ -115,12 +115,23 @@ FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk endif +ABS_DIST := $(shell cd $(DIST) && pwd) +ifeq ($(OS_ARCH),WINNT) +ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') +endif +NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS))) +ifneq (,$(strip $(NSPR_LIBDIR))) +NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR))) +else +NSPR_LIBDIR = $(ABS_DIST)/lib +endif # NSS makefiles are not safe for parallel execution. DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 DEFAULT_GMAKE_FLAGS += CC="$(CC)" -DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" -DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist -DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist +DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)" +DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR) DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) firefox-1.5.0.10-with-system-nss.patch: aclocal.m4 | 1 build/autoconf/nss.m4 | 67 ++++++++++++++ config/autoconf.mk.in | 43 +++++++++ config/config.mk | 33 ------- configure | 129 ++++++++++++++++++++++++++++ configure.in | 18 +++ security/manager/Makefile.in | 16 +++ security/manager/ssl/src/Makefile.in | 5 + security/manager/ssl/src/nsNSSComponent.cpp | 52 ++++------- 9 files changed, 301 insertions(+), 63 deletions(-) --- NEW FILE firefox-1.5.0.10-with-system-nss.patch --- --- mozilla/configure.in.ccc 2006-08-31 17:37:23.000000000 +0200 +++ mozilla/configure.in 2007-02-22 14:42:15.000000000 +0100 @@ -86,6 +86,7 @@ MOZPNG=10207 MOZZLIB=1.2.3 NSPR_VERSION=4 +NSS_VERSION=3 dnl Set the minimum version of toolkit libs used by mozilla dnl ======================================================== @@ -3537,6 +3538,19 @@ fi fi +dnl ======================================================== +dnl = If NSS was not detected in the system, +dnl = use the one in the source tree (mozilla/security/nss) +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-nss, +[ --with-system-nss Use system installed NSS], + _USE_SYSTEM_NSS=1 ) + +if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=]) +fi + if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== @@ -6783,6 +6797,10 @@ AC_SUBST(NSPR_LIBS) AC_SUBST(MOZ_NATIVE_NSPR) +AC_SUBST(NSS_CFLAGS) +AC_SUBST(NSS_LIBS) +AC_SUBST(MOZ_NATIVE_NSS) + AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(CPPFLAGS) --- mozilla/config/autoconf.mk.in.ccc 2006-04-21 22:50:30.000000000 +0200 +++ mozilla/config/autoconf.mk.in 2007-02-22 14:42:14.000000000 +0100 @@ -231,6 +231,7 @@ MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@ MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@ +MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@ CROSS_COMPILE = @CROSS_COMPILE@ @@ -386,6 +387,48 @@ NSPR_CFLAGS = @NSPR_CFLAGS@ NSPR_LIBS = @NSPR_LIBS@ +NSS_CONFIG = @NSS_CONFIG@ +NSS_CFLAGS = @NSS_CFLAGS@ +NSS_LIBS = @NSS_LIBS@ + +ifdef MOZ_NATIVE_NSS +NSS_DEP_LIBS = \ + $(NULL) +NSS_LIBS += \ + -lcrmf \ + $(NULL) +else +NSS_DEP_LIBS = \ + $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ + $(NULL) +NSS_LIBS = \ + $(LIBS_DIR) \ + $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + -lsmime3 \ + -lssl3 \ + -lnss3 \ + -lsoftokn3 \ + $(NULL) +endif + +ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) +ifndef GNU_CC +ifndef MOZ_NATIVE_NSS +NSS_LIBS = \ + $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ + $(NULL) +endif +endif +endif + LDAP_CFLAGS = @LDAP_CFLAGS@ LDAP_LIBS = @LDAP_LIBS@ XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@ --- mozilla/config/config.mk.ccc 2006-04-06 18:28:13.000000000 +0200 +++ mozilla/config/config.mk 2007-02-22 14:42:14.000000000 +0100 @@ -138,39 +138,6 @@ FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names -# -# NSS libs needed for final link in static build -# - -NSS_LIBS = \ - $(LIBS_DIR) \ - $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ - -lnss3 \ - -lsoftokn3 \ - $(NULL) - -ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) -ifndef GNU_CC -NSS_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ - $(NULL) -endif -endif - -NSS_DEP_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ - $(NULL) - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) --- mozilla/aclocal.m4.ccc 2004-05-13 05:12:47.000000000 +0200 +++ mozilla/aclocal.m4 2007-02-22 14:42:14.000000000 +0100 @@ -8,6 +8,7 @@ builtin(include, build/autoconf/libIDL.m4)dnl builtin(include, build/autoconf/libIDL-2.m4)dnl builtin(include, build/autoconf/nspr.m4)dnl +builtin(include, build/autoconf/nss.m4)dnl builtin(include, build/autoconf/libart.m4)dnl builtin(include, build/autoconf/pkg.m4)dnl builtin(include, build/autoconf/freetype2.m4)dnl --- /dev/null 2007-02-21 10:09:45.647705500 +0100 +++ mozilla/build/autoconf/nss.m4 2007-02-22 14:42:15.000000000 +0100 @@ -0,0 +1,67 @@ +# -*- tab-width: 4; -*- +# Configure paths for NSS +# Public domain - Chris Seawood 2001-04-05 +# Based upon gtk.m4 (also PD) by Owen Taylor + +dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS +AC_DEFUN(AM_PATH_NSS, +[dnl + +AC_ARG_WITH(nss-prefix, + [ --with-nss-prefix=PFX Prefix where NSS is installed], + nss_config_prefix="$withval", + nss_config_prefix="") + +AC_ARG_WITH(nss-exec-prefix, + [ --with-nss-exec-prefix=PFX + Exec prefix where NSS is installed], + nss_config_exec_prefix="$withval", + nss_config_exec_prefix="") + + if test -n "$nss_config_exec_prefix"; then + nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config + fi + fi + if test -n "$nss_config_prefix"; then + nss_config_args="$nss_config_args --prefix=$nss_config_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_prefix/bin/nss-config + fi + fi + + unset ac_cv_path_NSS_CONFIG + AC_PATH_PROG(NSS_CONFIG, nss-config, no) + min_nss_version=ifelse([$1], ,3.0.0,$1) + AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping)) + + no_nss="" + if test "$NSS_CONFIG" = "no"; then + no_nss="yes" + else + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` + + dnl Skip version check for now + nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + fi + + if test -z "$no_nss"; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + fi + + + AC_SUBST(NSS_CFLAGS) + AC_SUBST(NSS_LIBS) + +]) --- mozilla/configure.ccc 2006-08-31 17:37:23.000000000 +0200 +++ mozilla/configure 2007-02-22 14:42:15.000000000 +0100 @@ -44,6 +44,13 @@ --with-nspr-exec-prefix=PFX Exec prefix where NSPR is installed" ac_help="$ac_help + --with-system-nss Use system installed NSS" +ac_help="$ac_help + --with-nss-prefix=PFX Prefix where NSS is installed" +ac_help="$ac_help + --with-nss-exec-prefix=PFX + Exec prefix where NSS is installed" +ac_help="$ac_help --with-system-jpeg[=PFX] Use system libjpeg [installed at prefix PFX]" ac_help="$ac_help @@ -1023,6 +1030,7 @@ MOZPNG=10207 MOZZLIB=1.2.3 NSPR_VERSION=4 +NSS_VERSION=3 GLIB_VERSION=1.2.0 GTK_VERSION=1.2.0 @@ -11399,6 +11407,123 @@ fi fi + +# Check whether --with-system-nss or --without-system-nss was given. +if test "${with_system_nss+set}" = set; then + withval="$with_system_nss" + if test "$withval" = "yes"; then + _USE_SYSTEM_NSS=1 + elif test "$withval" = "no"; then + : + else + { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; } + fi +fi + + +if test -n "$_USE_SYSTEM_NSS"; then + +# Check whether --with-nss-prefix or --without-nss-prefix was given. +if test "${with_nss_prefix+set}" = set; then + withval="$with_nss_prefix" + nss_config_prefix="$withval" +else + nss_config_prefix="" +fi + + +# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given. +if test "${with_nss_exec_prefix+set}" = set; then + withval="$with_nss_exec_prefix" + nss_config_exec_prefix="$withval" +else + nss_config_exec_prefix="" +fi + + + if test -n "$nss_config_exec_prefix"; then + nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config + fi + fi + if test -n "$nss_config_prefix"; then + nss_config_args="$nss_config_args --prefix=$nss_config_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_prefix/bin/nss-config + fi + fi + + unset ac_cv_path_NSS_CONFIG + # Extract the first word of "nss-config", so it can be a program name with args. +set dummy nss-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:11363: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$NSS_CONFIG" in + /*) + ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no" + ;; +esac +fi +NSS_CONFIG="$ac_cv_path_NSS_CONFIG" +if test -n "$NSS_CONFIG"; then + echo "$ac_t""$NSS_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +echo "configure:11398: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then + no_nss="yes" + else + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` + + nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + fi + + if test -z "$no_nss"; then + echo "$ac_t""yes" 1>&6 + MOZ_NATIVE_NSS=1 + else + echo "$ac_t""no" 1>&6 + fi + + + + + + +fi + if test -z "$SKIP_LIBRARY_CHECKS"; then # Check whether --with-system-jpeg or --without-system-jpeg was given. if test "${with_system_jpeg+set}" = set; then @@ -19598,6 +19723,9 @@ s%@NSPR_CONFIG@%$NSPR_CONFIG%g s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g s%@NSPR_LIBS@%$NSPR_LIBS%g +s%@NSS_CONFIG@%$NSS_CONFIG%g +s%@NSS_CFLAGS@%$NSS_CFLAGS%g +s%@NSS_LIBS@%$NSS_LIBS%g s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g @@ -19879,6 +20007,7 @@ s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g +s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g s%@CROSS_COMPILE@%$CROSS_COMPILE%g --- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.ccc 2005-08-26 08:41:50.000000000 +0200 +++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp 2007-02-22 14:42:15.000000000 +0100 @@ -488,14 +488,6 @@ } -#ifdef XP_MAC -#ifdef DEBUG -#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb") -#else -#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb") -#endif /*DEBUG*/ -#endif /*XP_MAC*/ - static void setOCSPOptions(nsIPrefBranch * pref); NS_IMETHODIMP @@ -689,40 +681,40 @@ const char *possible_ckbi_locations[] = { NS_GRE_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR + NS_XPCOM_CURRENT_PROCESS_DIR, + 0 }; - + for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) { nsCOMPtr mozFile; - directoryService->Get( possible_ckbi_locations[il], - NS_GET_IID(nsILocalFile), - getter_AddRefs(mozFile)); + char *fullModuleName = nsnull; + + if (!possible_ckbi_locations[il]) + { + fullModuleName = PR_GetLibraryName(nsnull, "nssckbi"); + } + else + { + directoryService->Get( possible_ckbi_locations[il], + NS_GET_IID(nsILocalFile), + getter_AddRefs(mozFile)); - if (!mozFile) { - continue; + if (!mozFile) { + continue; + } + + nsCAutoString processDir; + mozFile->GetNativePath(processDir); + fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); } - char *fullModuleName = nsnull; -#ifdef XP_MAC - nsCAutoString nativePath; - mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files")); - mozFile->AppendNative(LOADABLE_CERTS_MODULE); - mozFile->GetNativePath(nativePath); - fullModuleName = (char *) nativePath.get(); -#else - nsCAutoString processDir; - mozFile->GetNativePath(processDir); - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); -#endif /* If a module exists with the same name, delete it. */ NS_ConvertUCS2toUTF8 modNameUTF8(modName); int modType; SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType); SECStatus rv_add = SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0); -#ifndef XP_MAC - PR_Free(fullModuleName); // allocated by NSPR -#endif + PR_FreeLibraryName(fullModuleName); // allocated by NSPR if (SECSuccess == rv_add) { // found a module, no need to try other directories break; --- mozilla/security/manager/ssl/src/Makefile.in.ccc 2005-08-03 07:24:18.000000000 +0200 +++ mozilla/security/manager/ssl/src/Makefile.in 2007-02-22 14:42:15.000000000 +0100 @@ -123,8 +123,13 @@ # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's +ifdef MOZ_NATIVE_NSS +LOCAL_INCLUDES += $(NSS_CFLAGS) \ + $(NULL) +else LOCAL_INCLUDES += -I$(DIST)/public/nss \ $(NULL) +endif EXTRA_DSO_LDOPTS += \ $(MOZ_UNICHARUTIL_LIBS) \ --- mozilla/security/manager/Makefile.in.ccc 2007-02-22 14:42:14.000000000 +0100 +++ mozilla/security/manager/Makefile.in 2007-02-22 14:45:44.000000000 +0100 @@ -46,6 +46,8 @@ MODULE = psm PACKAGE_FILE = psm.pkg + +ifndef MOZ_NATIVE_NSS PACKAGE_VARS += \ NSS3_LIB \ SMIME3_LIB \ @@ -60,6 +62,7 @@ $(NULL) LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) +endif NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) @@ -200,6 +203,7 @@ export:: .nss.cleaned .nss.cleaned: .nss.checkout +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean ifndef SKIP_CHK @@ -207,9 +211,12 @@ $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean endif touch $@ +endif .nss.checkout: +ifndef MOZ_NATIVE_NSS touch $(srcdir)/$@ +endif dependclean export packages chrome:: $(MAKE) -C boot $@ @@ -220,12 +227,15 @@ endif libs:: +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) +endif ifeq ($(OS_ARCH),WINNT) cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) else cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) endif +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) @@ -307,6 +317,7 @@ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin endif endif +endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C locales $@ @@ -315,6 +326,7 @@ endif install:: +ifndef MOZ_NATIVE_NSS $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) ifndef SKIP_CHK $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) @@ -351,6 +363,7 @@ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) endif +endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C locales $@ @@ -365,15 +378,18 @@ ifdef MOZ_XUL $(MAKE) -C pki $@ endif +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean endif +endif echo-requires-recursive:: $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C pki $@ $(MAKE) -C locales $@ + firefox-1.5-pango-printing.patch: config/system-headers | 3 gfx/src/freetype/nsFreeType.cpp | 18 gfx/src/freetype/nsFreeType.h | 7 gfx/src/gtk/mozilla-decoder.cpp | 71 +- gfx/src/gtk/mozilla-decoder.h | 28 gfx/src/gtk/nsDeviceContextGTK.cpp | 4 gfx/src/gtk/nsFontMetricsPango.cpp | 1226 ++++++++++++++++++++++++------------ gfx/src/gtk/nsFontMetricsPango.h | 160 +++- gfx/src/gtk/nsFontMetricsUtils.cpp | 21 gfx/src/ps/Makefile.in | 12 gfx/src/ps/nsDeviceContextPS.cpp | 56 + gfx/src/ps/nsFontMetricsPS.cpp | 305 ++++++++ gfx/src/ps/nsFontMetricsPS.h | 68 + gfx/src/ps/nsPostScriptObj.cpp | 124 +++ gfx/src/ps/nsPostScriptObj.h | 32 gfx/src/ps/nsRenderingContextPS.cpp | 206 ------ gfx/src/ps/nsRenderingContextPS.h | 11 gfx/src/ps/nsType1.cpp | 261 +++++-- gfx/src/ps/nsType1.h | 3 19 files changed, 1787 insertions(+), 829 deletions(-) Index: firefox-1.5-pango-printing.patch =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-6/firefox-1.5-pango-printing.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- firefox-1.5-pango-printing.patch 19 Dec 2006 21:29:31 -0000 1.3 +++ firefox-1.5-pango-printing.patch 1 Mar 2007 21:51:42 -0000 1.4 @@ -2904,17 +2904,6 @@ } #ifdef MOZ_ENABLE_XFT -@@ -2336,8 +2589,8 @@ - - nsXftType1Generator::~nsXftType1Generator() - { -- if (mEntry->mFace) -- FT_Done_Face(mEntry->mFace); -+ if (mEntry->mFace) -+ FT_Done_Face(mEntry->mFace); - - if (FT_Done_FreeType(mFreeTypeLibrary)) - return; @@ -2357,8 +2610,8 @@ } Index: sources =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-6/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 19 Dec 2006 21:29:31 -0000 1.20 +++ sources 1 Mar 2007 21:51:42 -0000 1.21 @@ -1,2 +1,2 @@ -bb74629a8d99a6653c5ab978cf9c6227 thunderbird-1.5.0.9-source.tar.bz2 -f38fb250f9c6946912af14930c2cc8e3 thunderbird-langpacks-1.5.0.9-20061215.tar.bz2 +65087f8a7adb0773ae7198ec21cc2975 thunderbird-1.5.0.10-source.tar.bz2 +0ac9a4a17d12422858c07fe553ee9ac2 thunderbird-langpacks-1.5.0.10-20070301.tar.bz2 Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-6/thunderbird.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- thunderbird.spec 12 Feb 2007 10:15:24 -0000 1.93 +++ thunderbird.spec 1 Mar 2007 21:51:42 -0000 1.94 @@ -7,8 +7,8 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 1.5.0.9 -Release: 8%{?dist} +Version: 1.5.0.10 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPL Group: Applications/Internet @@ -18,7 +18,7 @@ %define tarball thunderbird-1.5rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20061215.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20070301.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -30,9 +30,9 @@ # Build patches Patch2: firefox-1.0-prdtoa.patch -Patch4: firefox-1.5-with-system-nss.patch +Patch4: firefox-1.5.0.10-with-system-nss.patch Patch5: thunderbird-1.5-visibility.patch -Patch6: firefox-1.1-nss-system-nspr.patch +Patch6: firefox-1.5.0.10-nss-system-nspr.patch Patch10: thunderbird-0.7.3-psfonts.patch Patch11: thunderbird-0.7.3-gnome-uriloader.patch @@ -137,7 +137,7 @@ %patch102 -p0 -b .theme-change %patch103 -p1 -b .profile-migrator -%patch104 -p1 -b .dnd-nograb +#%patch104 -p1 -b .dnd-nograb %if %{official_branding} # Required by Mozilla Corporation @@ -277,6 +277,9 @@ #=============================================================================== %changelog +* Thu Mar 1 2007 Martin Stransky 1.5.0.10-1 +- Update to 1.5.0.10 + * Fri Feb 9 2007 Martin Stransky 1.5.0.9-8 - added fix for #227406: garbage characters on some websites (when pango is disabled) --- firefox-1.1-nss-system-nspr.patch DELETED --- --- firefox-1.5-with-system-nss.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 1 21:57:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 16:57:49 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.105, 1.106 policy-20070219.patch, 1.11, 1.12 selinux-policy.spec, 1.404, 1.405 sources, 1.111, 1.112 Message-ID: <200703012157.l21Lvn73012138@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12122 Modified Files: .cvsignore policy-20070219.patch selinux-policy.spec sources Log Message: * Thu Mar 1 2007 Dan Walsh 2.5.7-1 - Update to latest from upstream - Add fail2ban policy Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- .cvsignore 28 Feb 2007 21:23:19 -0000 1.105 +++ .cvsignore 1 Mar 2007 21:57:47 -0000 1.106 @@ -107,3 +107,4 @@ serefpolicy-2.5.4.tgz serefpolicy-2.5.5.tgz serefpolicy-2.5.6.tgz +serefpolicy-2.5.7.tgz policy-20070219.patch: Rules.modular | 10 + policy/flask/access_vectors | 4 policy/global_booleans | 2 policy/global_tunables | 65 ++++++- policy/mls | 33 +++- policy/modules/admin/acct.te | 1 policy/modules/admin/consoletype.te | 8 policy/modules/admin/dmesg.te | 1 policy/modules/admin/kudzu.te | 3 policy/modules/admin/netutils.te | 3 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 44 +++++ policy/modules/admin/rpm.te | 2 policy/modules/admin/su.if | 6 policy/modules/admin/sudo.if | 5 policy/modules/admin/sudo.te | 1 policy/modules/admin/usermanage.te | 20 ++ policy/modules/apps/gnome.if | 25 ++- policy/modules/apps/gpg.fc | 2 policy/modules/apps/gpg.if | 1 policy/modules/apps/loadkeys.if | 44 +---- policy/modules/apps/mozilla.if | 1 policy/modules/kernel/corecommands.if | 38 ++++ policy/modules/kernel/corenetwork.if.in | 78 ++++++++- policy/modules/kernel/corenetwork.te.in | 15 + policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.if | 36 ++++ policy/modules/kernel/domain.if | 18 ++ policy/modules/kernel/domain.te | 22 ++ policy/modules/kernel/files.if | 63 +++++++ policy/modules/kernel/filesystem.if | 20 ++ policy/modules/kernel/kernel.if | 23 ++ policy/modules/kernel/kernel.te | 2 policy/modules/kernel/mls.if | 20 ++ policy/modules/kernel/mls.te | 3 policy/modules/kernel/selinux.if | 38 ++++ 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 | 23 ++ policy/modules/services/apache.if | 158 +++++++++++++++++++ policy/modules/services/apache.te | 18 ++ policy/modules/services/automount.te | 1 policy/modules/services/ccs.te | 1 policy/modules/services/consolekit.fc | 2 policy/modules/services/consolekit.if | 46 +++++ policy/modules/services/consolekit.te | 62 +++++++ policy/modules/services/cpucontrol.te | 1 policy/modules/services/cron.fc | 1 policy/modules/services/cron.if | 33 +--- policy/modules/services/cron.te | 43 ++++- policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 58 ++++++- policy/modules/services/dhcp.te | 2 policy/modules/services/fail2ban.fc | 4 policy/modules/services/fail2ban.if | 87 ++++++++++ policy/modules/services/fail2ban.te | 77 +++++++++ policy/modules/services/ftp.te | 5 policy/modules/services/hal.fc | 6 policy/modules/services/hal.te | 93 ++++++++++- policy/modules/services/inetd.te | 5 policy/modules/services/mta.te | 2 policy/modules/services/nis.if | 4 policy/modules/services/nscd.if | 20 ++ policy/modules/services/nscd.te | 3 policy/modules/services/pegasus.if | 27 +++ policy/modules/services/pegasus.te | 5 policy/modules/services/postfix.te | 2 policy/modules/services/procmail.te | 13 + policy/modules/services/pyzor.if | 22 ++ policy/modules/services/pyzor.te | 9 + policy/modules/services/radius.te | 1 policy/modules/services/ricci.te | 10 - policy/modules/services/rpc.te | 26 ++- policy/modules/services/rsync.te | 1 policy/modules/services/samba.if | 21 ++ policy/modules/services/samba.te | 6 policy/modules/services/setroubleshoot.te | 4 policy/modules/services/smartmon.te | 1 policy/modules/services/spamassassin.fc | 1 policy/modules/services/spamassassin.if | 41 +++++ policy/modules/services/spamassassin.te | 15 + policy/modules/services/squid.fc | 1 policy/modules/services/squid.if | 2 policy/modules/services/squid.te | 12 + policy/modules/services/ssh.fc | 2 policy/modules/services/ssh.if | 39 ++++ policy/modules/services/ssh.te | 5 policy/modules/services/xserver.if | 2 policy/modules/services/xserver.te | 4 policy/modules/system/application.fc | 1 policy/modules/system/application.if | 113 +++++++++++++ policy/modules/system/application.te | 9 + policy/modules/system/authlogin.if | 87 ++++++++-- policy/modules/system/authlogin.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.te | 14 + policy/modules/system/init.if | 62 +++++++ policy/modules/system/init.te | 26 ++- policy/modules/system/ipsec.if | 100 ++++++++++++ policy/modules/system/iptables.te | 9 - policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 8 policy/modules/system/lvm.if | 23 ++ policy/modules/system/lvm.te | 17 +- policy/modules/system/modutils.te | 3 policy/modules/system/mount.te | 10 - policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 119 ++++++++++++++ policy/modules/system/selinuxutil.te | 147 ++++------------- policy/modules/system/unconfined.fc | 1 policy/modules/system/unconfined.te | 15 + policy/modules/system/userdomain.if | 246 ++++++++++++++++-------------- policy/modules/system/userdomain.te | 38 +++- policy/modules/system/xen.te | 26 +++ policy/support/obj_perm_sets.spt | 2 119 files changed, 2386 insertions(+), 404 deletions(-) Index: policy-20070219.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- policy-20070219.patch 1 Mar 2007 16:30:20 -0000 1.11 +++ policy-20070219.patch 1 Mar 2007 21:57:47 -0000 1.12 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.7/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2007-02-26 09:43:33.000000000 -0500 -+++ serefpolicy-2.5.7/policy/flask/access_vectors 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/flask/access_vectors 2007-03-01 11:40:30.000000000 -0500 @@ -598,6 +598,8 @@ shmempwd shmemgrp @@ -21,7 +21,7 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.7/policy/global_booleans --- nsaserefpolicy/policy/global_booleans 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.7/policy/global_booleans 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/global_booleans 2007-03-01 11:40:30.000000000 -0500 @@ -4,7 +4,6 @@ # file should be used. # @@ -40,7 +40,7 @@ ##

diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.7/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.7/policy/global_tunables 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/global_tunables 2007-03-01 11:40:30.000000000 -0500 @@ -162,7 +162,6 @@ ## gen_tunable(allow_smbd_anon_write,false) @@ -154,7 +154,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.7/policy/mls --- nsaserefpolicy/policy/mls 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.7/policy/mls 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/mls 2007-03-01 13:36:15.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 @@ -194,7 +194,7 @@ (( l1 dom l2 ) or (( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or ( t1 == mlsnetread )); -@@ -177,8 +191,9 @@ +@@ -177,13 +191,14 @@ ( t1 == mlsnetread )); # the socket "write" ops @@ -206,6 +206,12 @@ (( t1 == mlsnetwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or ( t1 == mlsnetwrite )); + # used by netlabel to restrict normal domains to same level connections +-mlsconstrain { tcp_socket udp_socket } recvfrom ++mlsconstrain { tcp_socket udp_socket rawip_socket } recvfrom + (( l1 eq l2 ) or + (( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or + ( t1 == mlsnetread )); @@ -274,7 +289,8 @@ # the netif/node "write" ops (implicit single level socket doing the write) @@ -228,7 +234,7 @@ mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.7/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/acct.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/acct.te 2007-03-01 11:40:30.000000000 -0500 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -239,7 +245,7 @@ logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.7/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/consoletype.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/consoletype.te 2007-03-01 11:40:30.000000000 -0500 @@ -8,7 +8,12 @@ type consoletype_t; @@ -264,7 +270,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.5.7/policy/modules/admin/dmesg.te --- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/dmesg.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/dmesg.te 2007-03-01 11:40:30.000000000 -0500 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -275,7 +281,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.5.7/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/kudzu.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/kudzu.te 2007-03-01 11:40:30.000000000 -0500 @@ -103,6 +103,9 @@ init_use_fds(kudzu_t) init_use_script_ptys(kudzu_t) @@ -288,7 +294,7 @@ libs_use_shared_libs(kudzu_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.5.7/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/netutils.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/netutils.te 2007-03-01 11:40:30.000000000 -0500 @@ -22,6 +22,7 @@ type traceroute_t; type traceroute_exec_t; @@ -308,7 +314,7 @@ corenet_non_ipsec_sendrecv(netutils_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.5.7/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/rpm.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/rpm.fc 2007-03-01 11:40:30.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) @@ -321,7 +327,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.7/policy/modules/admin/rpm.if --- nsaserefpolicy/policy/modules/admin/rpm.if 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/rpm.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/rpm.if 2007-03-01 11:40:30.000000000 -0500 @@ -270,3 +270,47 @@ dontaudit $1 rpm_var_lib_t:file manage_file_perms; dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms; @@ -372,7 +378,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.5.7/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/rpm.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/rpm.te 2007-03-01 11:40:30.000000000 -0500 @@ -9,6 +9,8 @@ type rpm_t; type rpm_exec_t; @@ -384,7 +390,7 @@ domain_system_change_exemption(rpm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.5.7/policy/modules/admin/sudo.if --- nsaserefpolicy/policy/modules/admin/sudo.if 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/sudo.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/sudo.if 2007-03-01 11:40:30.000000000 -0500 @@ -37,7 +37,6 @@ gen_require(` @@ -409,7 +415,7 @@ domain_sigchld_interactive_fds($1_sudo_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.te serefpolicy-2.5.7/policy/modules/admin/sudo.te --- nsaserefpolicy/policy/modules/admin/sudo.te 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/sudo.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/sudo.te 2007-03-01 11:40:30.000000000 -0500 @@ -7,5 +7,6 @@ type sudo_exec_t; @@ -419,7 +425,7 @@ # Remaining policy in per user domain template. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.5.7/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/su.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/su.if 2007-03-01 11:40:30.000000000 -0500 @@ -71,7 +71,7 @@ files_search_var_lib($1_su_t) files_dontaudit_getattr_tmp_dirs($1_su_t) @@ -449,7 +455,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.5.7/policy/modules/admin/usermanage.te --- nsaserefpolicy/policy/modules/admin/usermanage.te 2007-02-19 11:32:54.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/admin/usermanage.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/admin/usermanage.te 2007-03-01 11:40:30.000000000 -0500 @@ -263,6 +263,7 @@ optional_policy(` rpm_use_fds(groupadd_t) @@ -507,7 +513,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-2.5.7/policy/modules/apps/gnome.if --- nsaserefpolicy/policy/modules/apps/gnome.if 2007-02-19 11:32:52.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/apps/gnome.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/gnome.if 2007-03-01 11:40:30.000000000 -0500 @@ -105,6 +105,10 @@ ') @@ -555,7 +561,7 @@ ## This is a templated interface, and should only diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-2.5.7/policy/modules/apps/gpg.fc --- nsaserefpolicy/policy/modules/apps/gpg.fc 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/apps/gpg.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/gpg.fc 2007-03-01 11:40:30.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) @@ -565,7 +571,7 @@ -') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-2.5.7/policy/modules/apps/gpg.if --- nsaserefpolicy/policy/modules/apps/gpg.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/apps/gpg.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/gpg.if 2007-03-01 11:40:30.000000000 -0500 @@ -89,6 +89,7 @@ manage_files_pattern($1_gpg_t,$1_gpg_secret_t,$1_gpg_secret_t) @@ -576,7 +582,7 @@ domtrans_pattern($2,gpg_exec_t,$1_gpg_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.if serefpolicy-2.5.7/policy/modules/apps/loadkeys.if --- nsaserefpolicy/policy/modules/apps/loadkeys.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/apps/loadkeys.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/loadkeys.if 2007-03-01 11:40:30.000000000 -0500 @@ -11,16 +11,12 @@ ## # @@ -645,7 +651,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.5.7/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-02-19 11:32:52.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/apps/mozilla.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/apps/mozilla.if 2007-03-01 11:40:30.000000000 -0500 @@ -147,6 +147,7 @@ corenet_dontaudit_tcp_bind_generic_port($1_mozilla_t) @@ -656,25 +662,8 @@ dev_dontaudit_rw_dri($1_mozilla_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.5.7/policy/modules/kernel/corecommands.if --- nsaserefpolicy/policy/modules/kernel/corecommands.if 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/corecommands.if 2007-03-01 10:20:27.000000000 -0500 -@@ -928,7 +928,15 @@ - type bin_t, sbin_t; - ') - -- 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) -+ application_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 }) - ') -@@ -990,3 +998,41 @@ ++++ serefpolicy-2.5.7/policy/modules/kernel/corecommands.if 2007-03-01 11:40:30.000000000 -0500 +@@ -990,3 +990,41 @@ allow $1 exec_type:file { getattr read execute }; ') @@ -718,7 +707,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.5.7/policy/modules/kernel/corenetwork.if.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/corenetwork.if.in 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/corenetwork.if.in 2007-03-01 11:40:30.000000000 -0500 @@ -1034,10 +1034,10 @@ # interface(`corenet_tcp_sendrecv_reserved_port',` @@ -857,7 +846,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.in 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.in 2007-03-01 11:40:30.000000000 -0500 @@ -43,11 +43,16 @@ sid port gen_context(system_u:object_r:port_t,s0) @@ -900,7 +889,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.m4 serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.m4 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.m4 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.m4 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/corenetwork.te.m4 2007-03-01 11:40:30.000000000 -0500 @@ -55,8 +55,8 @@ define(`declare_ports',`dnl ifelse(eval($3 < 1024),1,` @@ -914,7 +903,7 @@ ifelse(`$5',`',`',`declare_ports($1,shiftn(4,$*))')dnl diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.5.7/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/devices.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/devices.if 2007-03-01 11:40:30.000000000 -0500 @@ -2449,6 +2449,24 @@ ######################################## @@ -964,7 +953,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.5.7/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/domain.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/domain.if 2007-03-01 11:40:30.000000000 -0500 @@ -1254,3 +1254,21 @@ typeattribute $1 can_change_object_identity; typeattribute $1 set_curr_context; @@ -989,7 +978,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.5.7/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/domain.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/domain.te 2007-03-01 11:40:30.000000000 -0500 @@ -144,3 +144,25 @@ # act on all domains keys @@ -1018,7 +1007,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.5.7/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2007-02-26 14:17:21.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/files.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/files.if 2007-03-01 11:40:30.000000000 -0500 @@ -110,7 +110,14 @@ ## # @@ -1136,7 +1125,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.5.7/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/filesystem.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/filesystem.if 2007-03-01 11:40:30.000000000 -0500 @@ -1110,11 +1110,31 @@ type dosfs_t; ') @@ -1171,7 +1160,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.5.7/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/kernel.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/kernel.if 2007-03-01 11:40:30.000000000 -0500 @@ -1830,6 +1830,26 @@ ######################################## @@ -1211,7 +1200,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.5.7/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2007-02-19 11:32:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/kernel.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/kernel.te 2007-03-01 11:40:30.000000000 -0500 @@ -138,6 +138,8 @@ type unlabeled_t; sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) @@ -1223,7 +1212,7 @@ sid file_labels gen_context(system_u:object_r:unlabeled_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.5.7/policy/modules/kernel/mls.if --- nsaserefpolicy/policy/modules/kernel/mls.if 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/mls.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/mls.if 2007-03-01 11:40:30.000000000 -0500 @@ -154,6 +154,26 @@ ######################################## ##

@@ -1253,7 +1242,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.5.7/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/mls.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/mls.te 2007-03-01 11:40:30.000000000 -0500 @@ -18,6 +18,7 @@ attribute mlsnetreadtoclr; attribute mlsnetwrite; @@ -1273,7 +1262,7 @@ attribute privrangetrans; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.5.7/policy/modules/kernel/selinux.if --- nsaserefpolicy/policy/modules/kernel/selinux.if 2007-02-27 14:37:10.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/selinux.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/selinux.if 2007-03-01 11:40:30.000000000 -0500 @@ -51,6 +51,44 @@ ######################################## @@ -1321,7 +1310,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.5.7/policy/modules/kernel/storage.fc --- nsaserefpolicy/policy/modules/kernel/storage.fc 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/storage.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/storage.fc 2007-03-01 11:40:30.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) @@ -1332,7 +1321,7 @@ /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.7/policy/modules/kernel/storage.if --- nsaserefpolicy/policy/modules/kernel/storage.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/storage.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/storage.if 2007-03-01 11:40:30.000000000 -0500 @@ -100,6 +100,7 @@ dev_list_all_dev_nodes($1) @@ -1351,7 +1340,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.5.7/policy/modules/kernel/terminal.if --- nsaserefpolicy/policy/modules/kernel/terminal.if 2007-02-20 16:35:52.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/terminal.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/terminal.if 2007-03-01 11:40:30.000000000 -0500 @@ -1052,7 +1052,7 @@ ') @@ -1363,7 +1352,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-2.5.7/policy/modules/kernel/terminal.te --- nsaserefpolicy/policy/modules/kernel/terminal.te 2007-02-20 16:35:52.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/kernel/terminal.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/kernel/terminal.te 2007-03-01 11:40:30.000000000 -0500 @@ -28,6 +28,7 @@ type devpts_t; files_mountpoint(devpts_t) @@ -1374,7 +1363,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.5.7/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/apache.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/apache.fc 2007-03-01 11:40:30.000000000 -0500 @@ -1,10 +1,5 @@ # temporary hack till genhomedircon is fixed -ifdef(`targeted_policy',` @@ -1422,7 +1411,7 @@ +/var/lib/bugzilla(/.*)? gen_context(system_u:object_r:httpd_bugzilla_script_rw_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.5.7/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/apache.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/apache.if 2007-03-01 11:40:30.000000000 -0500 @@ -268,6 +268,9 @@ ') @@ -1608,7 +1597,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.5.7/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/apache.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/apache.te 2007-03-01 11:40:30.000000000 -0500 @@ -171,6 +171,7 @@ allow httpd_t httpd_modules_t:dir list_dir_perms; mmap_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t) @@ -1647,7 +1636,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.5.7/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/automount.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/automount.te 2007-03-01 11:40:30.000000000 -0500 @@ -69,6 +69,7 @@ files_mounton_all_mountpoints(automount_t) files_mount_all_file_type_fs(automount_t) @@ -1658,7 +1647,7 @@ fs_unmount_all_fs(automount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.5.7/policy/modules/services/ccs.te --- nsaserefpolicy/policy/modules/services/ccs.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/ccs.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ccs.te 2007-03-01 11:40:30.000000000 -0500 @@ -33,6 +33,7 @@ allow ccs_t self:capability { ipc_lock sys_nice sys_resource sys_admin }; @@ -1669,13 +1658,13 @@ allow ccs_t self:unix_dgram_socket create_socket_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-2.5.7/policy/modules/services/consolekit.fc --- nsaserefpolicy/policy/modules/services/consolekit.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/consolekit.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/consolekit.fc 2007-03-01 11:40:30.000000000 -0500 @@ -0,0 +1,2 @@ + +/usr/sbin/console-kit-daemon -- gen_context(system_u:object_r:consolekit_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-2.5.7/policy/modules/services/consolekit.if --- nsaserefpolicy/policy/modules/services/consolekit.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/consolekit.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/consolekit.if 2007-03-01 11:40:30.000000000 -0500 @@ -0,0 +1,46 @@ + +## policy for consolekit @@ -1725,7 +1714,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-2.5.7/policy/modules/services/consolekit.te --- nsaserefpolicy/policy/modules/services/consolekit.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/consolekit.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/consolekit.te 2007-03-01 11:40:30.000000000 -0500 @@ -0,0 +1,62 @@ +policy_module(consolekit,1.0.0) + @@ -1791,7 +1780,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-2.5.7/policy/modules/services/cpucontrol.te --- nsaserefpolicy/policy/modules/services/cpucontrol.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/cpucontrol.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cpucontrol.te 2007-03-01 11:40:30.000000000 -0500 @@ -91,6 +91,7 @@ kernel_read_system_state(cpuspeed_t) kernel_read_kernel_sysctls(cpuspeed_t) @@ -1802,7 +1791,7 @@ domain_use_interactive_fds(cpuspeed_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-2.5.7/policy/modules/services/cron.fc --- nsaserefpolicy/policy/modules/services/cron.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/cron.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cron.fc 2007-03-01 11:40:30.000000000 -0500 @@ -45,3 +45,4 @@ /var/spool/fcron/systab\.orig -- gen_context(system_u:object_r:system_cron_spool_t,s0) /var/spool/fcron/systab -- gen_context(system_u:object_r:system_cron_spool_t,s0) @@ -1810,7 +1799,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.7/policy/modules/services/cron.if --- nsaserefpolicy/policy/modules/services/cron.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/cron.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cron.if 2007-03-01 11:40:30.000000000 -0500 @@ -35,6 +35,7 @@ # template(`cron_per_role_template',` @@ -1921,7 +1910,7 @@ # fcron wants an instant update of a crontab change for the administrator diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.5.7/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/cron.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cron.te 2007-03-01 11:40:30.000000000 -0500 @@ -25,6 +25,9 @@ type cron_log_t; logging_log_file(cron_log_t) @@ -2037,7 +2026,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.5.7/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/cvs.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/cvs.te 2007-03-01 11:40:30.000000000 -0500 @@ -9,6 +9,7 @@ type cvs_t; type cvs_exec_t; @@ -2048,7 +2037,7 @@ type cvs_data_t; # customizable diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.5.7/policy/modules/services/dbus.if --- nsaserefpolicy/policy/modules/services/dbus.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/dbus.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/dbus.if 2007-03-01 11:40:30.000000000 -0500 @@ -69,7 +69,7 @@ # Local policy # @@ -2134,7 +2123,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-2.5.7/policy/modules/services/dhcp.te --- nsaserefpolicy/policy/modules/services/dhcp.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/dhcp.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/dhcp.te 2007-03-01 11:40:30.000000000 -0500 @@ -125,6 +125,8 @@ dbus_system_bus_client_template(dhcpd,dhcpd_t) dbus_connect_system_bus(dhcpd_t) @@ -2146,7 +2135,7 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-2.5.7/policy/modules/services/fail2ban.fc --- nsaserefpolicy/policy/modules/services/fail2ban.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/fail2ban.fc 2007-03-01 11:14:04.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/fail2ban.fc 2007-03-01 11:40:30.000000000 -0500 @@ -0,0 +1,4 @@ + +/usr/bin/fail2ban -- gen_context(system_u:object_r:fail2ban_exec_t,s0) @@ -2154,7 +2143,7 @@ +/var/run/fail2ban.pid -- gen_context(system_u:object_r:fail2ban_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-2.5.7/policy/modules/services/fail2ban.if --- nsaserefpolicy/policy/modules/services/fail2ban.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/fail2ban.if 2007-03-01 11:14:04.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/fail2ban.if 2007-03-01 11:40:30.000000000 -0500 @@ -0,0 +1,87 @@ + +## policy for fail2ban @@ -2245,7 +2234,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-2.5.7/policy/modules/services/fail2ban.te --- nsaserefpolicy/policy/modules/services/fail2ban.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/fail2ban.te 2007-03-01 11:16:42.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/fail2ban.te 2007-03-01 11:40:30.000000000 -0500 @@ -0,0 +1,77 @@ +policy_module(fail2ban,1.0.0) + @@ -2326,7 +2315,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.5.7/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2007-02-28 14:03:21.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/ftp.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ftp.te 2007-03-01 11:40:30.000000000 -0500 @@ -190,10 +190,15 @@ userdom_manage_all_users_home_content_dirs(ftpd_t) userdom_manage_all_users_home_content_files(ftpd_t) @@ -2345,7 +2334,7 @@ tunable_policy(`ftp_home_dir && use_nfs_home_dirs',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.5.7/policy/modules/services/hal.fc --- nsaserefpolicy/policy/modules/services/hal.fc 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/hal.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/hal.fc 2007-03-01 11:40:30.000000000 -0500 @@ -8,4 +8,10 @@ /var/lib/hal(/.*)? gen_context(system_u:object_r:hald_var_lib_t,s0) @@ -2359,7 +2348,7 @@ +/usr/libexec/hald-addon-macbookpro-backlight -- gen_context(system_u:object_r:hald_mac_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.7/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/hal.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/hal.te 2007-03-01 11:40:30.000000000 -0500 @@ -16,9 +16,24 @@ type hald_var_run_t; files_pid_file(hald_var_run_t) @@ -2514,7 +2503,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.5.7/policy/modules/services/inetd.te --- nsaserefpolicy/policy/modules/services/inetd.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/inetd.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/inetd.te 2007-03-01 11:40:30.000000000 -0500 @@ -140,8 +140,8 @@ mls_fd_use_all_levels(inetd_t) mls_fd_share_all_levels(inetd_t) @@ -2537,7 +2526,7 @@ manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.5.7/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/mta.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/mta.te 2007-03-01 11:40:30.000000000 -0500 @@ -27,6 +27,7 @@ type sendmail_exec_t; @@ -2556,7 +2545,7 @@ apache_dontaudit_append_log(system_mail_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.5.7/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/nis.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/nis.if 2007-03-01 11:40:30.000000000 -0500 @@ -48,8 +48,8 @@ corenet_udp_bind_all_nodes($1) corenet_tcp_bind_generic_port($1) @@ -2570,7 +2559,7 @@ corenet_tcp_connect_portmap_port($1) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.5.7/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/nscd.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/nscd.if 2007-03-01 11:40:30.000000000 -0500 @@ -173,3 +173,23 @@ allow $1 nscd_t:nscd *; @@ -2597,7 +2586,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.5.7/policy/modules/services/nscd.te --- nsaserefpolicy/policy/modules/services/nscd.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/nscd.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/nscd.te 2007-03-01 11:40:30.000000000 -0500 @@ -117,6 +117,9 @@ term_dontaudit_use_unallocated_ttys(nscd_t) term_dontaudit_use_generic_ptys(nscd_t) @@ -2610,7 +2599,7 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.5.7/policy/modules/services/pegasus.if --- nsaserefpolicy/policy/modules/services/pegasus.if 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/pegasus.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/pegasus.if 2007-03-01 11:40:30.000000000 -0500 @@ -1 +1,28 @@ ## The Open Group Pegasus CIM/WBEM Server. + @@ -2642,7 +2631,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.5.7/policy/modules/services/pegasus.te --- nsaserefpolicy/policy/modules/services/pegasus.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/pegasus.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/pegasus.te 2007-03-01 11:40:30.000000000 -0500 @@ -99,13 +99,12 @@ auth_use_nsswitch(pegasus_t) @@ -2659,20 +2648,9 @@ files_read_var_lib_symlinks(pegasus_t) hostname_exec(pegasus_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-2.5.7/policy/modules/services/postfix.fc ---- nsaserefpolicy/policy/modules/services/postfix.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/postfix.fc 2007-03-01 10:20:27.000000000 -0500 -@@ -9,6 +9,7 @@ - /usr/libexec/postfix/(n)?qmgr -- gen_context(system_u:object_r:postfix_qmgr_exec_t,s0) - /usr/libexec/postfix/showq -- gen_context(system_u:object_r:postfix_showq_exec_t,s0) - /usr/libexec/postfix/smtp -- gen_context(system_u:object_r:postfix_smtp_exec_t,s0) -+/usr/libexec/postfix/lmtp -- gen_context(system_u:object_r:postfix_smtp_exec_t,s0) - /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.7/policy/modules/services/postfix.te ---- nsaserefpolicy/policy/modules/services/postfix.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/postfix.te 2007-03-01 10:20:27.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/postfix.te 2007-03-01 16:15:29.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/postfix.te 2007-03-01 11:40:30.000000000 -0500 @@ -173,6 +173,8 @@ mta_rw_aliases(postfix_master_t) mta_read_sendmail_bin(postfix_master_t) @@ -2682,17 +2660,9 @@ ifdef(`targeted_policy',` term_dontaudit_use_unallocated_ttys(postfix_master_t) term_dontaudit_use_generic_ptys(postfix_master_t) -@@ -386,6 +388,7 @@ - - postfix_list_spool(postfix_pickup_t) - -+allow postfix_pickup_t postfix_spool_maildrop_t:dir r_dir_perms; - read_files_pattern(postfix_pickup_t,postfix_spool_maildrop_t,postfix_spool_maildrop_t) - delete_files_pattern(postfix_pickup_t,postfix_spool_maildrop_t,postfix_spool_maildrop_t) - diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.5.7/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/procmail.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/procmail.te 2007-03-01 11:40:30.000000000 -0500 @@ -10,15 +10,19 @@ type procmail_exec_t; domain_type(procmail_t) @@ -2737,7 +2707,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-2.5.7/policy/modules/services/pyzor.if --- nsaserefpolicy/policy/modules/services/pyzor.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/pyzor.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/pyzor.if 2007-03-01 11:40:30.000000000 -0500 @@ -64,6 +64,10 @@ ## # @@ -2773,7 +2743,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.5.7/policy/modules/services/pyzor.te --- nsaserefpolicy/policy/modules/services/pyzor.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/pyzor.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/pyzor.te 2007-03-01 11:40:30.000000000 -0500 @@ -26,6 +26,9 @@ type pyzor_var_lib_t; files_type(pyzor_var_lib_t) @@ -2797,9 +2767,20 @@ kernel_read_kernel_sysctls(pyzor_t) kernel_read_system_state(pyzor_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.5.7/policy/modules/services/radius.te +--- nsaserefpolicy/policy/modules/services/radius.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/radius.te 2007-03-01 13:19:03.000000000 -0500 +@@ -36,6 +36,7 @@ + allow radiusd_t self:unix_stream_socket create_stream_socket_perms; + allow radiusd_t self:tcp_socket create_stream_socket_perms; + allow radiusd_t self:udp_socket create_socket_perms; ++allow radiusd_t self:netlink_route_socket r_netlink_socket_perms; + + allow radiusd_t radiusd_etc_t:dir r_dir_perms; + read_files_pattern(radiusd_t,radiusd_etc_t,radiusd_etc_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.5.7/policy/modules/services/ricci.te --- nsaserefpolicy/policy/modules/services/ricci.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/ricci.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ricci.te 2007-03-01 11:40:30.000000000 -0500 @@ -420,6 +420,7 @@ files_read_etc_runtime_files(ricci_modservice_t) files_search_usr(ricci_modservice_t) @@ -2839,7 +2820,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.5.7/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/rpc.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/rpc.te 2007-03-01 11:40:30.000000000 -0500 @@ -120,16 +120,20 @@ # GSSD local policy # @@ -2899,7 +2880,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.5.7/policy/modules/services/rsync.te --- nsaserefpolicy/policy/modules/services/rsync.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/rsync.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/rsync.te 2007-03-01 11:40:30.000000000 -0500 @@ -9,6 +9,7 @@ type rsync_t; type rsync_exec_t; @@ -2910,7 +2891,7 @@ type rsync_data_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.5.7/policy/modules/services/samba.if --- nsaserefpolicy/policy/modules/services/samba.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/samba.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/samba.if 2007-03-01 11:40:30.000000000 -0500 @@ -177,6 +177,27 @@ ######################################## @@ -2941,7 +2922,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.5.7/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/samba.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/samba.te 2007-03-01 11:40:30.000000000 -0500 @@ -278,6 +278,10 @@ userdom_dontaudit_use_unpriv_user_fds(smbd_t) userdom_use_unpriv_users_fds(smbd_t) @@ -2964,7 +2945,7 @@ allow nmbd_t samba_log_t:dir setattr; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.5.7/policy/modules/services/setroubleshoot.te --- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/setroubleshoot.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/setroubleshoot.te 2007-03-01 11:40:30.000000000 -0500 @@ -74,8 +74,10 @@ files_read_usr_files(setroubleshootd_t) files_read_etc_files(setroubleshootd_t) @@ -2989,7 +2970,7 @@ term_dontaudit_use_generic_ptys(setroubleshootd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.5.7/policy/modules/services/smartmon.te --- nsaserefpolicy/policy/modules/services/smartmon.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/smartmon.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/smartmon.te 2007-03-01 11:40:30.000000000 -0500 @@ -60,6 +60,7 @@ fs_search_auto_mountpoints(fsdaemon_t) @@ -3000,7 +2981,7 @@ storage_raw_write_fixed_disk(fsdaemon_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.5.7/policy/modules/services/spamassassin.fc --- nsaserefpolicy/policy/modules/services/spamassassin.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/spamassassin.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/spamassassin.fc 2007-03-01 11:40:30.000000000 -0500 @@ -7,6 +7,7 @@ /usr/sbin/spamd -- gen_context(system_u:object_r:spamd_exec_t,s0) @@ -3011,7 +2992,7 @@ HOME_DIR/\.spamassassin(/.*)? gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-2.5.7/policy/modules/services/spamassassin.if --- nsaserefpolicy/policy/modules/services/spamassassin.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/spamassassin.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/spamassassin.if 2007-03-01 11:40:30.000000000 -0500 @@ -496,3 +496,44 @@ dontaudit $1 spamd_tmp_t:sock_file getattr; @@ -3059,7 +3040,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.5.7/policy/modules/services/spamassassin.te --- nsaserefpolicy/policy/modules/services/spamassassin.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/spamassassin.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/spamassassin.te 2007-03-01 11:40:30.000000000 -0500 @@ -8,7 +8,7 @@ # spamassassin client executable @@ -3126,7 +3107,7 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-2.5.7/policy/modules/services/squid.fc --- nsaserefpolicy/policy/modules/services/squid.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/squid.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/squid.fc 2007-03-01 11:40:30.000000000 -0500 @@ -12,3 +12,4 @@ /var/run/squid\.pid -- gen_context(system_u:object_r:squid_var_run_t,s0) @@ -3134,7 +3115,7 @@ +/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.7/policy/modules/services/squid.if --- nsaserefpolicy/policy/modules/services/squid.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/squid.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/squid.if 2007-03-01 11:40:30.000000000 -0500 @@ -36,7 +36,7 @@ ') @@ -3146,7 +3127,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.5.7/policy/modules/services/squid.te --- nsaserefpolicy/policy/modules/services/squid.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/squid.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/squid.te 2007-03-01 11:40:30.000000000 -0500 @@ -81,6 +81,8 @@ corenet_tcp_bind_ftp_port(squid_t) corenet_tcp_bind_gopher_port(squid_t) @@ -3179,7 +3160,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-2.5.7/policy/modules/services/ssh.fc --- nsaserefpolicy/policy/modules/services/ssh.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/ssh.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ssh.fc 2007-03-01 11:40:30.000000000 -0500 @@ -12,8 +12,6 @@ /var/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) @@ -3191,7 +3172,7 @@ -') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.5.7/policy/modules/services/ssh.if --- nsaserefpolicy/policy/modules/services/ssh.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/ssh.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ssh.if 2007-03-01 11:40:30.000000000 -0500 @@ -728,3 +728,42 @@ dontaudit $1 sshd_key_t:file { getattr read }; @@ -3237,7 +3218,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.5.7/policy/modules/services/ssh.te --- nsaserefpolicy/policy/modules/services/ssh.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/ssh.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/ssh.te 2007-03-01 11:40:30.000000000 -0500 @@ -10,11 +10,11 @@ # Type for the ssh-agent executable. @@ -3262,7 +3243,7 @@ tunable_policy(`ssh_sysadm_login',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.5.7/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/xserver.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/xserver.if 2007-03-01 11:40:30.000000000 -0500 @@ -826,7 +826,7 @@ type xdm_t; ') @@ -3274,7 +3255,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.5.7/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/services/xserver.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/services/xserver.te 2007-03-01 11:40:30.000000000 -0500 @@ -345,6 +345,10 @@ ') @@ -3288,17 +3269,38 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.fc serefpolicy-2.5.7/policy/modules/system/application.fc --- nsaserefpolicy/policy/modules/system/application.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/application.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/application.fc 2007-03-01 11:40:30.000000000 -0500 @@ -0,0 +1 @@ +# No application file contexts. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-2.5.7/policy/modules/system/application.if --- nsaserefpolicy/policy/modules/system/application.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/application.if 2007-03-01 10:20:27.000000000 -0500 -@@ -0,0 +1,41 @@ ++++ serefpolicy-2.5.7/policy/modules/system/application.if 2007-03-01 12:02:52.000000000 -0500 +@@ -0,0 +1,113 @@ +## Policy for application domains + +######################################## +## ++## Make the specified type usable as an application domain. ++## ++## ++## ++## Type to be used as a domain type. ++## ++## ++# ++interface(`application_type',` ++ gen_require(` ++ attribute application_type; ++ ') ++ ++ typeattribute $1 application_type; ++ ++ # start with basic domain ++ domain_type($1) ++') ++ ++######################################## ++## +## Make the specified type usable for files +## that are exectuables, such as binary programs. +## This does not include shared libraries. @@ -3336,19 +3338,73 @@ + + can_exec($1, application_exec_type) +') ++ ++######################################## ++## ++## Execute all executable files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`application_exec_all',` ++ # Need this dontaudit or command completion fires hundreds of avcs ++ corecmd_dontaudit_exec_all_executables($1) ++ corecmd_exec_bin($1) ++ corecmd_exec_sbin($1) ++ corecmd_exec_shell($1) ++ corecmd_exec_ls($1) ++ corecmd_exec_chroot($1) ++ application_exec($1) ++') ++ ++######################################## ++## ++## Create a domain which can be started by users ++## ++## ++## ++## Type to be used as a domain. ++## ++## ++## ++## ++## Type of the program to be used as an entry point to this domain. ++## ++## ++# ++interface(`application_domain',` ++ ++ application_type($1) ++ application_executable_file($2) ++ domain_entry_file($1,$2) ++ role system_r types $1; ++ ++ optional_policy(` ++ ssh_sigchld($1) ++ ssh_rw_stream_sockets($1) ++ ') ++ ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-2.5.7/policy/modules/system/application.te --- nsaserefpolicy/policy/modules/system/application.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/application.te 2007-03-01 10:20:27.000000000 -0500 -@@ -0,0 +1,6 @@ ++++ serefpolicy-2.5.7/policy/modules/system/application.te 2007-03-01 11:57:33.000000000 -0500 +@@ -0,0 +1,9 @@ + +policy_module(application,1.0.0) + ++# Attribute of user applications ++attribute application_type; ++ +# Executables to be run by user +attribute application_exec_type; + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.5.7/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/authlogin.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/authlogin.if 2007-03-01 11:40:30.000000000 -0500 @@ -152,21 +152,12 @@ ## # @@ -3478,7 +3534,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.5.7/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/authlogin.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/authlogin.te 2007-03-01 11:40:30.000000000 -0500 @@ -9,6 +9,7 @@ attribute can_read_shadow_passwords; attribute can_write_shadow_passwords; @@ -3498,7 +3554,7 @@ corecmd_search_sbin(system_chkpwd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.5.7/policy/modules/system/fstools.fc --- nsaserefpolicy/policy/modules/system/fstools.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/fstools.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/fstools.fc 2007-03-01 11:40:30.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) @@ -3509,7 +3565,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.7/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/fstools.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/fstools.te 2007-03-01 11:40:30.000000000 -0500 @@ -9,6 +9,7 @@ type fsadm_t; type fsadm_exec_t; @@ -3520,7 +3576,7 @@ type fsadm_log_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.5.7/policy/modules/system/getty.te --- nsaserefpolicy/policy/modules/system/getty.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/getty.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/getty.te 2007-03-01 11:40:30.000000000 -0500 @@ -33,7 +33,8 @@ # @@ -3533,7 +3589,7 @@ allow getty_t self:fifo_file rw_fifo_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.5.7/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/hostname.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/hostname.te 2007-03-01 11:40:30.000000000 -0500 @@ -8,8 +8,12 @@ type hostname_t; @@ -3562,7 +3618,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.5.7/policy/modules/system/init.if --- nsaserefpolicy/policy/modules/system/init.if 2007-02-26 14:17:21.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/init.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/init.if 2007-03-01 11:40:30.000000000 -0500 @@ -202,11 +202,14 @@ gen_require(` type initrc_t; @@ -3643,7 +3699,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.5.7/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2007-02-26 14:17:21.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/init.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/init.te 2007-03-01 11:40:30.000000000 -0500 @@ -205,8 +205,7 @@ allow initrc_t initrc_devpts_t:chr_file rw_term_perms; term_create_pty(initrc_t,initrc_devpts_t) @@ -3703,7 +3759,7 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-2.5.7/policy/modules/system/ipsec.if --- nsaserefpolicy/policy/modules/system/ipsec.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/ipsec.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/ipsec.if 2007-03-01 11:40:30.000000000 -0500 @@ -111,3 +111,103 @@ files_search_pids($1) manage_files_pattern($1,ipsec_var_run_t,ipsec_var_run_t) @@ -3810,7 +3866,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.5.7/policy/modules/system/iptables.te --- nsaserefpolicy/policy/modules/system/iptables.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/iptables.te 2007-03-01 11:15:04.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/iptables.te 2007-03-01 11:40:30.000000000 -0500 @@ -77,9 +77,10 @@ userdom_use_all_users_fds(iptables_t) @@ -3834,7 +3890,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.5.7/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/locallogin.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/locallogin.te 2007-03-01 11:40:30.000000000 -0500 @@ -48,6 +48,8 @@ allow local_login_t self:msgq create_msgq_perms; allow local_login_t self:msg { send receive }; @@ -3864,7 +3920,7 @@ corecmd_read_sbin_symlinks(local_login_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.5.7/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2007-02-23 16:50:01.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/logging.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/logging.te 2007-03-01 11:40:30.000000000 -0500 @@ -328,6 +328,9 @@ corenet_tcp_bind_all_nodes(syslogd_t) corenet_tcp_bind_rsh_port(syslogd_t) @@ -3886,7 +3942,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.if serefpolicy-2.5.7/policy/modules/system/lvm.if --- nsaserefpolicy/policy/modules/system/lvm.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/lvm.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/lvm.if 2007-03-01 11:40:30.000000000 -0500 @@ -63,10 +63,31 @@ # interface(`lvm_read_config',` @@ -3922,7 +3978,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.7/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/lvm.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/lvm.te 2007-03-01 11:40:30.000000000 -0500 @@ -46,7 +46,7 @@ allow clvmd_t self:capability { sys_admin mknod }; @@ -3984,7 +4040,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.5.7/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/modutils.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/modutils.te 2007-03-01 11:40:30.000000000 -0500 @@ -54,6 +54,8 @@ can_exec(insmod_t, insmod_exec_t) @@ -4004,7 +4060,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.5.7/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/mount.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/mount.te 2007-03-01 11:40:30.000000000 -0500 @@ -9,6 +9,7 @@ type mount_t; type mount_exec_t; @@ -4041,7 +4097,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.5.7/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/selinuxutil.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/selinuxutil.fc 2007-03-01 11:40:30.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) @@ -4054,7 +4110,7 @@ # /var/run diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.5.7/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/selinuxutil.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/selinuxutil.if 2007-03-01 11:40:30.000000000 -0500 @@ -616,7 +616,7 @@ gen_require(` type selinux_config_t; @@ -4201,7 +4257,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.7/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/selinuxutil.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/selinuxutil.te 2007-03-01 12:03:00.000000000 -0500 @@ -1,10 +1,8 @@ policy_module(selinuxutil,1.4.1) @@ -4215,26 +4271,103 @@ ') ######################################## -@@ -108,6 +106,18 @@ - domain_entry_file(semanage_t, semanage_exec_t) - role system_r types semanage_t; +@@ -26,11 +24,8 @@ + files_type(selinux_config_t) + type checkpolicy_t, can_write_binary_policy; +-domain_type(checkpolicy_t) +-role system_r types checkpolicy_t; +- + type checkpolicy_exec_t; +-domain_entry_file(checkpolicy_t,checkpolicy_exec_t) ++application_domain(checkpolicy_t, checkpolicy_exec_t) + + # + # default_context_t is the type applied to +@@ -47,20 +42,15 @@ + files_type(file_context_t) + + type load_policy_t; +-domain_type(load_policy_t) +-role system_r types load_policy_t; +- + type load_policy_exec_t; +-domain_entry_file(load_policy_t,load_policy_exec_t) ++application_domain(load_policy_t,load_policy_exec_t) + + type newrole_t; ++type newrole_exec_t; ++application_domain(newrole_t,newrole_exec_t) ++domain_interactive_fd(newrole_t) + domain_role_change_exemption(newrole_t) + domain_obj_id_change_exemption(newrole_t) +-domain_type(newrole_t) +-domain_interactive_fd(newrole_t) +- +-type newrole_exec_t; +-domain_entry_file(newrole_t,newrole_exec_t) + + # + # policy_config_t is the type of /etc/security/selinux/* +@@ -83,30 +73,34 @@ + type restorecon_exec_t; + domain_obj_id_change_exemption(restorecon_t) + init_system_domain(restorecon_t,restorecon_exec_t) +-role system_r types restorecon_t; ++application_type($1) + + type restorecond_t; + type restorecond_exec_t; + init_daemon_domain(restorecond_t,restorecond_exec_t) + domain_obj_id_change_exemption(restorecond_t) +-role system_r types restorecond_t; + + type restorecond_var_run_t; + files_pid_file(restorecond_var_run_t) + + type run_init_t; + type run_init_exec_t; +-domain_type(run_init_t) +-domain_entry_file(run_init_t,run_init_exec_t) ++application_domain(run_init_t) + domain_system_change_exemption(run_init_t) + + type semanage_t; +-domain_type(semanage_t) ++type semanage_exec_t; ++application_domain(semanage_t, semanage_exec_t) + domain_interactive_fd(semanage_t) + +-type semanage_exec_t; +-domain_entry_file(semanage_t, semanage_exec_t) +-role system_r types semanage_t; +type semanage_gui_t; -+domain_type(semanage_gui_t) -+domain_interactive_fd(semanage_gui_t) -+ +type semanage_gui_exec_t; -+domain_entry_file(semanage_gui_t, semanage_gui_exec_t) -+role system_r types semanage_gui_t; ++application_domain(semanage_gui_t, semanage_gui_exec_t) ++domain_interactive_fd(semanage_gui_t) + +ifdef(`targeted_policy',` +init_system_domain(semanage_t, semanage_exec_t) +') -+ + type semanage_store_t; files_type(semanage_store_t) +@@ -121,12 +115,9 @@ + files_type(semanage_trans_lock_t) -@@ -195,6 +205,7 @@ + type setfiles_t, can_relabelto_binary_policy; +-domain_obj_id_change_exemption(setfiles_t) +-domain_type(setfiles_t) +-role system_r types setfiles_t; +- + type setfiles_exec_t; +-domain_entry_file(setfiles_t,setfiles_exec_t) ++application_domain(setfiles_t,setfiles_exec_t) ++domain_obj_id_change_exemption(setfiles_t) + + ifdef(`distro_redhat',` + init_system_domain(setfiles_t,setfiles_exec_t) +@@ -195,6 +186,7 @@ fs_getattr_xattr_fs(load_policy_t) mls_file_read_up(load_policy_t) @@ -4242,7 +4375,7 @@ selinux_get_fs_mount(load_policy_t) selinux_load_policy(load_policy_t) -@@ -310,15 +321,13 @@ +@@ -310,15 +302,13 @@ userdom_dontaudit_search_all_users_home_content(newrole_t) userdom_search_all_users_home_dirs(newrole_t) @@ -4265,7 +4398,7 @@ tunable_policy(`allow_polyinstantiation',` files_polyinstantiate_all(newrole_t) -@@ -557,82 +566,12 @@ +@@ -557,82 +547,12 @@ ######################################## # @@ -4352,27 +4485,14 @@ ######################################## # -@@ -707,3 +646,17 @@ +@@ -707,3 +627,4 @@ unconfined_dontaudit_read_pipes(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/unconfined.fc serefpolicy-2.5.7/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/unconfined.fc 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/unconfined.fc 2007-03-01 11:40:30.000000000 -0500 @@ -10,4 +10,5 @@ /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) @@ -4381,7 +4501,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.7/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/unconfined.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/unconfined.te 2007-03-01 11:40:30.000000000 -0500 @@ -50,6 +50,8 @@ userdom_unconfined(unconfined_t) userdom_priveleged_home_dir_manager(unconfined_t) @@ -4431,7 +4551,7 @@ init_dbus_chat_script(unconfined_execmem_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.7/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/userdomain.if 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/userdomain.if 2007-03-01 11:44:07.000000000 -0500 @@ -115,6 +115,10 @@ # Allow making the stack executable via mprotect. allow $1_t self:process execstack; @@ -4451,6 +4571,15 @@ init_read_utmp($1_t) # The library functions always try to open read-write first, +@@ -995,7 +1000,7 @@ + manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t) + filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file }) + +- corecmd_exec_all_executables($1_t) ++ application_exec_all($1_t) + + # port access is audited even if dac would not have allowed it, so dontaudit it here + corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) @@ -1368,11 +1373,7 @@ ## # @@ -4835,7 +4964,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.7/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/userdomain.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/userdomain.te 2007-03-01 11:40:30.000000000 -0500 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -4926,7 +5055,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.7/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.7/policy/modules/system/xen.te 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/modules/system/xen.te 2007-03-01 11:40:30.000000000 -0500 @@ -166,8 +166,13 @@ files_manage_etc_runtime_files(xend_t) files_etc_filetrans_etc_runtime(xend_t,file) @@ -4981,7 +5110,7 @@ +fs_read_dos_files(xend_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.7/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.7/policy/support/obj_perm_sets.spt 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/policy/support/obj_perm_sets.spt 2007-03-01 11:40:30.000000000 -0500 @@ -215,7 +215,7 @@ define(`getattr_file_perms',`{ getattr }') define(`setattr_file_perms',`{ setattr }') @@ -4993,7 +5122,7 @@ define(`write_file_perms',`{ getattr write append lock ioctl }') diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.7/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-16 17:15:29.000000000 -0500 -+++ serefpolicy-2.5.7/Rules.modular 2007-03-01 10:20:27.000000000 -0500 ++++ serefpolicy-2.5.7/Rules.modular 2007-03-01 11:40:30.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.404 retrieving revision 1.405 diff -u -r1.404 -r1.405 --- selinux-policy.spec 1 Mar 2007 16:30:20 -0000 1.404 +++ selinux-policy.spec 1 Mar 2007 21:57:47 -0000 1.405 @@ -166,7 +166,7 @@ %description SELinux Reference Policy - modular. -Based off of reference policy: Checked out revision 2202. +Based off of reference policy: Checked out revision 2204. %prep %setup -q -n serefpolicy-%{version} Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- sources 28 Feb 2007 21:23:19 -0000 1.111 +++ sources 1 Mar 2007 21:57:47 -0000 1.112 @@ -1 +1 @@ -93a369ee1cbb25856d699acfc94cfb11 serefpolicy-2.5.6.tgz +5209f5a625764686415aac33935756f5 serefpolicy-2.5.7.tgz From fedora-cvs-commits at redhat.com Thu Mar 1 22:05:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 17:05:16 -0500 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.22, 1.23 selinux-policy.spec, 1.346, 1.347 Message-ID: <200703012205.l21M5Gf4012733@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv12715 Modified Files: policy-20061106.patch selinux-policy.spec Log Message: * Thu Mar 1 2007 Dan Walsh 2.4.6-42 - Fix filespec for /dev/ub* - Allow ftp and telnet to use kerberos key files - Allow syslog to use alternate ports - Allow radious to look at the routing table - Allow pyzor to getattr on autofs policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 74 +++ 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 | 8 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 | 18 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 43 ++ 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 | 42 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++- policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 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 | 210 ++++++++- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 19 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 13 policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 152 +++++++ policy/modules/kernel/corenetwork.te.in | 17 policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 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 | 222 ++++++++++ policy/modules/kernel/filesystem.if | 43 +- policy/modules/kernel/filesystem.te | 13 policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 12 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 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 | 16 policy/modules/services/apache.if | 19 policy/modules/services/apache.te | 39 + 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 | 7 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 | 52 ++ policy/modules/services/cups.te | 7 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 62 ++ policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/ftp.te | 18 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 57 ++ policy/modules/services/hal.te | 22 - policy/modules/services/inetd.te | 28 + policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 3 policy/modules/services/kerberos.te | 13 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.fc | 1 policy/modules/services/mta.if | 1 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 30 + 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/openca.if | 4 policy/modules/services/openca.te | 2 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 | 28 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 1 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 21 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 | 23 + policy/modules/services/samba.te | 21 policy/modules/services/sasl.te | 2 policy/modules/services/sendmail.te | 8 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 | 4 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 18 policy/modules/services/squid.fc | 1 policy/modules/services/squid.if | 1 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 10 policy/modules/services/telnet.te | 3 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 | 76 +++ 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 | 63 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 107 +++++ policy/modules/system/iptables.te | 22 - policy/modules/system/libraries.fc | 38 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 22 - policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 ++ policy/modules/system/lvm.te | 78 +++ 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 | 68 +-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 37 + 219 files changed, 5005 insertions(+), 602 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- policy-20061106.patch 23 Feb 2007 16:04:53 -0000 1.22 +++ policy-20061106.patch 1 Mar 2007 22:05:14 -0000 1.23 @@ -2544,7 +2544,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.4.6/policy/modules/kernel/corenetwork.if.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/kernel/corenetwork.if.in 2007-02-16 12:14:40.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/kernel/corenetwork.if.in 2007-02-23 15:46:04.000000000 -0500 @@ -998,9 +998,11 @@ interface(`corenet_tcp_sendrecv_reserved_port',` gen_require(` @@ -2688,7 +2688,7 @@ ## Send generic client packets. ## ## -@@ -1875,3 +1935,40 @@ +@@ -1875,3 +1935,93 @@ typeattribute $1 corenet_unconfined_type; ') @@ -2729,6 +2729,59 @@ + allow $1 { port_type -reserved_port_type }:tcp_socket name_bind; +') + ++######################################## ++## ++## Define type to be a network port type ++## ++## ++## ++## Type to be used for network ports. ++## ++## ++# ++interface(`corenet_port_type',` ++ gen_require(` ++ attribute port_type; ++ ') ++ ++ typeattribute $1 port_type; ++') ++ ++######################################## ++## ++## Define network type to be a reserved port (< 1024) ++## ++## ++## ++## Type to be used for network ports. ++## ++## ++# ++interface(`corenet_reserved_port_type',` ++ gen_require(` ++ attribute reserved_port_type; ++ ') ++ ++ typeattribute $1 reserved_port_type; ++') ++ ++######################################## ++## ++## Define network type to be a rpc port ( 512< PORT < 1024) ++## ++## ++## ++## Type to be used for network ports. ++## ++## ++# ++interface(`corenet_rpc_port_type',` ++ gen_require(` ++ attribute rpc_port_type; ++ ') ++ ++ typeattribute $1 rpc_port_type; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.4.6/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-11-29 12:04:51.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/kernel/corenetwork.te.in 2007-02-16 12:14:40.000000000 -0500 @@ -3669,15 +3722,17 @@ attribute privrangetrans; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.4.6/policy/modules/kernel/storage.fc --- nsaserefpolicy/policy/modules/kernel/storage.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/kernel/storage.fc 2007-02-16 12:14:40.000000000 -0500 -@@ -42,6 +42,7 @@ ++++ serefpolicy-2.4.6/policy/modules/kernel/storage.fc 2007-03-01 16:48:00.000000000 -0500 +@@ -42,7 +42,8 @@ /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/ub[a-z] -b gen_context(system_u:object_r:removable_device_t,mls_systemhigh) +/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/ub[a-z][0-9]+ -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.4.6/policy/modules/kernel/storage.if --- nsaserefpolicy/policy/modules/kernel/storage.if 2006-11-29 12:04:51.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/kernel/storage.if 2007-02-16 12:14:40.000000000 -0500 @@ -4690,7 +4745,7 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.4.6/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/ftp.te 2007-02-16 12:14:40.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/ftp.te 2007-02-26 10:23:31.000000000 -0500 @@ -103,6 +103,8 @@ corenet_tcp_bind_ftp_port(ftpd_t) corenet_tcp_bind_ftp_data_port(ftpd_t) @@ -4740,6 +4795,17 @@ ') tunable_policy(`ftp_home_dir && use_nfs_home_dirs',` +@@ -224,6 +238,10 @@ + ') + + optional_policy(` ++ kerberos_read_keytab(ftpd_t) ++') ++ ++optional_policy(` + daemontools_service_domain(ftpd_t, ftpd_exec_t) + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.4.6/policy/modules/services/hal.fc --- nsaserefpolicy/policy/modules/services/hal.fc 2006-11-29 12:04:49.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/services/hal.fc 2007-02-16 12:14:40.000000000 -0500 @@ -5900,7 +5966,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.4.6/policy/modules/services/pyzor.te --- nsaserefpolicy/policy/modules/services/pyzor.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/pyzor.te 2007-02-16 12:14:40.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/pyzor.te 2007-03-01 09:31:38.000000000 -0500 @@ -26,6 +26,9 @@ type pyzor_var_lib_t; files_type(pyzor_var_lib_t) @@ -5922,7 +5988,16 @@ kernel_read_kernel_sysctls(pyzor_t) kernel_read_system_state(pyzor_t) -@@ -65,6 +72,10 @@ +@@ -51,6 +58,8 @@ + + files_read_etc_files(pyzor_t) + ++fs_search_auto_mountpoints(pyzor_t) ++ + auth_use_nsswitch(pyzor_t) + + libs_use_ld_so(pyzor_t) +@@ -65,6 +74,10 @@ amavis_manage_spool_files(pyzor_t) ') @@ -5933,6 +6008,17 @@ optional_policy(` spamassassin_read_spamd_tmp_files(pyzor_t) ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.4.6/policy/modules/services/radius.te +--- nsaserefpolicy/policy/modules/services/radius.te 2006-11-29 12:04:51.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/radius.te 2007-03-01 13:28:39.000000000 -0500 +@@ -36,6 +36,7 @@ + allow radiusd_t self:unix_stream_socket create_stream_socket_perms; + allow radiusd_t self:tcp_socket create_stream_socket_perms; + allow radiusd_t self:udp_socket create_socket_perms; ++allow radiusd_t self:netlink_route_socket r_netlink_socket_perms; + + allow radiusd_t radiusd_etc_t:file r_file_perms; + allow radiusd_t radiusd_etc_t:dir r_dir_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-2.4.6/policy/modules/services/radvd.te --- nsaserefpolicy/policy/modules/services/radvd.te 2006-11-29 12:04:49.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/services/radvd.te 2007-02-16 12:14:40.000000000 -0500 @@ -6823,7 +6909,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-2.4.6/policy/modules/services/telnet.te --- nsaserefpolicy/policy/modules/services/telnet.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/telnet.te 2007-02-16 12:14:40.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/telnet.te 2007-02-26 10:23:41.000000000 -0500 @@ -32,6 +32,7 @@ allow telnetd_t self:udp_socket create_socket_perms; # for identd; cjp: this should probably only be inetd_child rules? @@ -6832,6 +6918,17 @@ allow telnetd_t self:capability { setuid setgid }; allow telnetd_t telnetd_devpts_t:chr_file { rw_file_perms setattr }; +@@ -86,8 +87,10 @@ + remotelogin_domtrans(telnetd_t) + + # for identd; cjp: this should probably only be inetd_child rules? ++ + optional_policy(` + kerberos_use(telnetd_t) ++ kerberos_read_keytab(ftpd_t) + ') + + optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.4.6/policy/modules/services/tftp.te --- nsaserefpolicy/policy/modules/services/tftp.te 2006-11-29 12:04:49.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/services/tftp.te 2007-02-16 12:14:40.000000000 -0500 @@ -6993,7 +7090,7 @@ +logging_search_logs(uux_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.4.6/policy/modules/services/xserver.fc --- nsaserefpolicy/policy/modules/services/xserver.fc 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/xserver.fc 2007-02-16 12:14:40.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/xserver.fc 2007-02-26 16:10:14.000000000 -0500 @@ -44,7 +44,7 @@ # /tmp # @@ -8402,7 +8499,7 @@ corecmd_read_sbin_symlinks(local_login_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.4.6/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/logging.te 2007-02-16 12:14:40.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/logging.te 2007-02-26 16:03:41.000000000 -0500 @@ -53,6 +53,7 @@ type var_log_t; @@ -8429,7 +8526,7 @@ # Create and bind to /dev/log or /var/run/log. allow syslogd_t devlog_t:sock_file create_file_perms; files_pid_filetrans(syslogd_t,devlog_t,sock_file) -@@ -326,6 +327,15 @@ +@@ -326,6 +327,18 @@ corenet_udp_sendrecv_all_ports(syslogd_t) corenet_udp_bind_all_nodes(syslogd_t) corenet_udp_bind_syslogd_port(syslogd_t) @@ -8441,11 +8538,14 @@ +corenet_tcp_bind_all_nodes(syslogd_t) +corenet_tcp_bind_rsh_port(syslogd_t) +corenet_tcp_connect_rsh_port(syslogd_t) ++# Allow users to define additional syslog ports to connect to ++corenet_tcp_bind_syslogd_port(syslogd_t) ++corenet_tcp_connect_syslogd_port(syslogd_t) + # syslog-ng can send or receive logs corenet_sendrecv_syslogd_client_packets(syslogd_t) corenet_sendrecv_syslogd_server_packets(syslogd_t) -@@ -398,3 +408,8 @@ +@@ -398,3 +411,8 @@ # log to the xconsole xserver_rw_console(syslogd_t) ') @@ -8456,8 +8556,16 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.4.6/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/lvm.fc 2007-02-16 12:14:40.000000000 -0500 -@@ -95,3 +95,4 @@ ++++ serefpolicy-2.4.6/policy/modules/system/lvm.fc 2007-03-01 09:48:11.000000000 -0500 +@@ -15,6 +15,7 @@ + # + /etc/lvm(/.*)? gen_context(system_u:object_r:lvm_etc_t,s0) + /etc/lvm/\.cache -- gen_context(system_u:object_r:lvm_metadata_t,s0) ++/etc/lvm/cache(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0) + /etc/lvm/archive(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0) + /etc/lvm/backup(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0) + /etc/lvm/lock(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0) +@@ -95,3 +96,4 @@ /var/cache/multipathd(/.*)? gen_context(system_u:object_r:lvm_metadata_t,s0) /var/lock/lvm(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0) /var/run/multipathd.sock -s gen_context(system_u:object_r:lvm_var_run_t,s0) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.346 retrieving revision 1.347 diff -u -r1.346 -r1.347 --- selinux-policy.spec 23 Feb 2007 15:36:38 -0000 1.346 +++ selinux-policy.spec 1 Mar 2007 22:05:14 -0000 1.347 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 41%{?dist} +Release: 42%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -353,6 +353,13 @@ %endif %changelog +* Thu Mar 1 2007 Dan Walsh 2.4.6-42 +- Fix filespec for /dev/ub* +- Allow ftp and telnet to use kerberos key files +- Allow syslog to use alternate ports +- Allow radious to look at the routing table +- Allow pyzor to getattr on autofs + * Thu Feb 22 2007 Dan Walsh 2.4.6-41 - Allow samba to run as domain controller - execute useradd From fedora-cvs-commits at redhat.com Thu Mar 1 22:27:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 17:27:34 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.379, 1.380 anaconda.spec, 1.506, 1.507 sources, 1.503, 1.504 Message-ID: <200703012227.l21MRYCt006295@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6277 Modified Files: .cvsignore anaconda.spec sources Log Message: Here's another anaconda. Enjoy! Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- .cvsignore 26 Feb 2007 22:02:36 -0000 1.379 +++ .cvsignore 1 Mar 2007 22:27:31 -0000 1.380 @@ -2,3 +2,4 @@ anaconda-11.2.0.25.tar.bz2 anaconda-11.2.0.26.tar.bz2 anaconda-11.2.0.27.tar.bz2 +anaconda-11.2.0.28.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.506 retrieving revision 1.507 diff -u -r1.506 -r1.507 --- anaconda.spec 26 Feb 2007 22:02:36 -0000 1.506 +++ anaconda.spec 1 Mar 2007 22:27:31 -0000 1.507 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.27 +Version: 11.2.0.28 Release: 1 License: GPL Summary: Graphical system installer @@ -112,6 +112,19 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Mar 01 2007 Chris Lumens - 11.2.0.28-1 +- Support multiple %ksappend lines (#222201). +- Set the ksdata after setting the initial timezone values (#230472). +- New progress screen interface that's easier on backends (katzj). +- Handle KickstartError exns better than just dumping a backtrace. +- Add an updates ks command. +- Apply a patch to support RAID10 (Orion Poplawski , + #230268). +- Fix reserve-size option on splittree.py (katzj, #230343). +- Apply a patch to clean up strings (Paul W. Frields , + #204564). +- Focus the next button when enter is pressed on the password screen (#206568). + * Mon Feb 26 2007 Chris Lumens - 11.2.0.27-1 - Clean up partitioning text (katzj, #228198, #221791). - Write out the fstab after migrating (katzj, #223215). Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.503 retrieving revision 1.504 diff -u -r1.503 -r1.504 --- sources 26 Feb 2007 22:02:36 -0000 1.503 +++ sources 1 Mar 2007 22:27:31 -0000 1.504 @@ -1 +1 @@ -93556fd9c04bf7e3cfc051037d3f1303 anaconda-11.2.0.27.tar.bz2 +afe55badf06b61740cd94e87bb030be2 anaconda-11.2.0.28.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 1 22:32:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 17:32:07 -0500 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.23, 1.24 selinux-policy.spec, 1.347, 1.348 Message-ID: <200703012232.l21MW71u020177@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20022 Modified Files: policy-20061106.patch selinux-policy.spec Log Message: * Thu Mar 1 2007 Dan Walsh 2.4.6-42 - Dontaudit restorecon writing to cron pipes Resolves: #229318 - Fix filespec for /dev/ub* - Allow ftp and telnet to use kerberos key files - Allow syslog to use alternate ports - Allow radious to look at the routing table - Allow pyzor to getattr on autofs policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 74 +++ 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 | 8 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 | 18 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 43 ++ 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 | 42 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++- policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 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 | 210 ++++++++- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 19 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 13 policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 152 +++++++ policy/modules/kernel/corenetwork.te.in | 17 policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 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 | 222 ++++++++++ policy/modules/kernel/filesystem.if | 43 +- policy/modules/kernel/filesystem.te | 13 policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 12 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 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 | 16 policy/modules/services/apache.if | 19 policy/modules/services/apache.te | 39 + 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 | 7 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 | 52 ++ policy/modules/services/cups.te | 7 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 62 ++ policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/ftp.te | 18 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 57 ++ policy/modules/services/hal.te | 22 - policy/modules/services/inetd.te | 28 + policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 3 policy/modules/services/kerberos.te | 13 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.fc | 1 policy/modules/services/mta.if | 1 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 30 + 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/openca.if | 4 policy/modules/services/openca.te | 2 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 | 28 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 1 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 21 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 | 23 + policy/modules/services/samba.te | 21 policy/modules/services/sasl.te | 2 policy/modules/services/sendmail.te | 8 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 | 4 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 18 policy/modules/services/squid.fc | 1 policy/modules/services/squid.if | 1 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 10 policy/modules/services/telnet.te | 3 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 | 76 +++ 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 | 63 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 107 +++++ policy/modules/system/iptables.te | 22 - policy/modules/system/libraries.fc | 38 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 22 - policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 ++ policy/modules/system/lvm.te | 78 +++ 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 | 68 +-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 37 + 219 files changed, 5005 insertions(+), 602 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- policy-20061106.patch 1 Mar 2007 22:05:14 -0000 1.23 +++ policy-20061106.patch 1 Mar 2007 22:32:04 -0000 1.24 @@ -2713,7 +2713,7 @@ + +######################################## +## -+## Bind TCP sockets to all ports > 1024. ++## Bind TCP sockets to all ports greater than 1024. +## +## +## @@ -2749,7 +2749,7 @@ + +######################################## +## -+## Define network type to be a reserved port (< 1024) ++## Define network type to be a reserved port (less than 1024) +## +## +## @@ -2767,7 +2767,7 @@ + +######################################## +## -+## Define network type to be a rpc port ( 512< PORT < 1024) ++## Define network type to be a rpc port ( 512 lt PORT lt 1024) +## +## +## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- selinux-policy.spec 1 Mar 2007 22:05:14 -0000 1.347 +++ selinux-policy.spec 1 Mar 2007 22:32:04 -0000 1.348 @@ -354,6 +354,8 @@ %changelog * Thu Mar 1 2007 Dan Walsh 2.4.6-42 +- Dontaudit restorecon writing to cron pipes +Resolves: #229318 - Fix filespec for /dev/ub* - Allow ftp and telnet to use kerberos key files - Allow syslog to use alternate ports From fedora-cvs-commits at redhat.com Thu Mar 1 22:34:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 17:34:46 -0500 Subject: rpms/nfs-utils/devel nfs-utils-1.0.10-mount-fake.patch, NONE, 1.1 nfs-utils.spec, 1.118, 1.119 Message-ID: <200703012234.l21MYkYk022082@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22030 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.0.10-mount-fake.patch Log Message: * Thu Mar 1 2007 Karel Zak 1.0.11-2 - Fixed mount.nfs -f (fake) option (bz 227988) nfs-utils-1.0.10-mount-fake.patch: mount.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) --- NEW FILE nfs-utils-1.0.10-mount-fake.patch --- Signed-off-by: Karel Zak --- nfs-utils-1.0.10/utils/mount/mount.c.kzak 2007-02-09 12:26:16.000000000 +0100 +++ nfs-utils-1.0.10/utils/mount/mount.c 2007-02-09 12:27:59.000000000 +0100 @@ -494,20 +494,21 @@ &extra_opts, &mount_opts, 0); } } - if (fake) - return 0; if (mnt_err) exit(EX_FAIL); - mnt_err = do_mount_syscall(spec, mount_point, - nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts); + if (!fake) { + mnt_err = do_mount_syscall(spec, mount_point, + nfs_mount_vers == 4 ? "nfs4" : "nfs", + flags, mount_opts); - if(mnt_err) { - mount_error(mount_point); - exit(EX_FAIL); + if (mnt_err) { + mount_error(mount_point); + exit(EX_FAIL); + } } - if(!nomtab) { + if (!nomtab) { add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, extra_opts, 0, 0); } Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- nfs-utils.spec 22 Feb 2007 21:49:33 -0000 1.118 +++ nfs-utils.spec 1 Mar 2007 22:34:44 -0000 1.119 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.11 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 # group all 32bit related archs @@ -44,6 +44,7 @@ Patch78: nfs-utils-1.0.10-udp-no-connect.patch Patch79: nfs-utils-1.0.10-v4-umounts.patch Patch80: nfs-utils-1.0.9-mount-quotes.patch +Patch81: nfs-utils-1.0.10-mount-fake.patch %if %{enablefscache} Patch90: nfs-utils-1.0.9-mount-fsc.patch @@ -109,6 +110,7 @@ %patch78 -p1 %patch79 -p1 %patch80 -p1 +%patch81 -p1 %if %{enablefscache} %patch90 -p1 %endif @@ -285,6 +287,9 @@ %endif %changelog +* Thu Mar 1 2007 Karel Zak 1.0.11-2 +- Fixed mount.nfs -f (fake) option (bz 227988) + * Thu Feb 22 2007 Steve Dickson 1.0.11-1 - Upgraded to 1.0.11 From fedora-cvs-commits at redhat.com Thu Mar 1 22:38:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 17:38:01 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.142, 1.143 policycoreutils-rhat.patch, 1.290, 1.291 policycoreutils.spec, 1.380, 1.381 sources, 1.147, 1.148 Message-ID: <200703012238.l21Mc1u5024402@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24331 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Thu Mar 1 2007 Dan Walsh 2.0.7-1 - Update to upstream * Merged restorecond init script LSB compliance patch from Steve Grubb. -sepolgen * Merged better matching for refpolicy style from Karl MacMillan * Merged support for extracting interface paramaters from interface calls from Karl MacMillan * Merged support for parsing USER_AVC audit messages from Karl MacMillan. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- .cvsignore 27 Feb 2007 16:37:10 -0000 1.142 +++ .cvsignore 1 Mar 2007 22:37:59 -0000 1.143 @@ -138,3 +138,5 @@ policycoreutils-2.0.6.tgz sepolgen-1.0.2.tgz sepolgen-1.0.3.tgz +policycoreutils-2.0.7.tgz +sepolgen-1.0.4.tgz policycoreutils-rhat.patch: Makefile | 2 +- restorecond/restorecond.c | 12 +++++++----- restorecond/restorecond.conf | 3 +++ scripts/chcat | 17 ++++++++++------- semanage/seobject.py | 1 + 5 files changed, 22 insertions(+), 13 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- policycoreutils-rhat.patch 27 Feb 2007 16:37:10 -0000 1.290 +++ policycoreutils-rhat.patch 1 Mar 2007 22:37:59 -0000 1.291 @@ -50,95 +50,6 @@ +/etc/lvm/.cache ~/public_html ~/.mozilla/plugins/libflashplayer.so -diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.6/restorecond/restorecond.init ---- nsapolicycoreutils/restorecond/restorecond.init 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-2.0.6/restorecond/restorecond.init 2007-02-27 11:34:54.000000000 -0500 -@@ -1,43 +1,68 @@ - #!/bin/sh - # --# restorecond: Daemo used to maintain path file context -+# restorecond: Daemon used to maintain path file context - # --# chkconfig: 2345 10 90 -+# chkconfig: 2345 12 87 - # description: restorecond uses inotify to look for creation of new files \ - # listed in the /etc/selinux/restorecond.conf file, and restores the \ - # correct security context. - # -+# processname: /usr/sbin/restorecond -+# config: /etc/selinux/restorecond.conf -+# pidfile: /var/run/restorecond.pid -+# -+# Return values according to LSB for all commands but status: -+# 0 - success -+# 1 - generic or unspecified error -+# 2 - invalid or excess argument(s) -+# 3 - unimplemented feature (e.g. "reload") -+# 4 - insufficient privilege -+# 5 - program is not installed -+# 6 - program is not configured -+# 7 - program is not running -+ -+PATH=/sbin:/bin:/usr/bin:/usr/sbin - - # Source function library. - . /etc/rc.d/init.d/functions - - [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 0 - -+# Check that we are root ... so non-root users stop here -+test $EUID = 0 || exit 4 -+ -+test -x /usr/sbin/restorecond || exit 5 -+test -f /etc/selinux/restorecond.conf || exit 6 -+ -+RETVAL=0 -+ - start() - { - echo -n $"Starting restorecond: " -+ unset HOME MAIL USER USERNAME - daemon /usr/sbin/restorecond -- -+ RETVAL=$? - touch /var/lock/subsys/restorecond - echo -+ return $RETVAL - } - - stop() - { - echo -n $"Shutting down restorecond: " - killproc restorecond -- -+ RETVAL=$? - rm -f /var/lock/subsys/restorecond - echo -+ return $RETVAL - } -+ - restart() - { - stop - start - } - --[ -f /usr/sbin/restorecond ] || exit 0 -- - # See how we were called. - case "$1" in - start) -@@ -57,7 +82,8 @@ - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload|condrestart}" -- exit 1 -+ RETVAL=3 - esac - --exit 0 -+exit $RETVAL -+ diff --exclude-from=exclude --exclude=sepolgen-1.0.2 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.6/scripts/chcat --- nsapolicycoreutils/scripts/chcat 2007-02-22 08:53:22.000000000 -0500 +++ policycoreutils-2.0.6/scripts/chcat 2007-02-27 11:30:03.000000000 -0500 Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.380 retrieving revision 1.381 diff -u -r1.380 -r1.381 --- policycoreutils.spec 27 Feb 2007 16:37:10 -0000 1.380 +++ policycoreutils.spec 1 Mar 2007 22:37:59 -0000 1.381 @@ -2,11 +2,11 @@ %define libsepolver 2.0.1-1 %define libsemanagever 1.10.0-1 %define libselinuxver 2.0.0-1 -%define sepolgenver 1.0.3 +%define sepolgenver 1.0.4 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 2.0.6 -Release: 3%{?dist} +Version: 2.0.7 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -186,6 +186,14 @@ fi %changelog +* Thu Mar 1 2007 Dan Walsh 2.0.7-1 +- Update to upstream + * Merged restorecond init script LSB compliance patch from Steve Grubb. + -sepolgen + * Merged better matching for refpolicy style from Karl MacMillan + * Merged support for extracting interface paramaters from interface calls from Karl MacMillan + * Merged support for parsing USER_AVC audit messages from Karl MacMillan. + * Tue Feb 27 2007 Dan Walsh 2.0.6-3 - Update to upstream -sepolgen Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- sources 27 Feb 2007 16:37:10 -0000 1.147 +++ sources 1 Mar 2007 22:37:59 -0000 1.148 @@ -1,2 +1,2 @@ -55b324eacb47b4e660964fb7896d15fd policycoreutils-2.0.6.tgz -ceeaa37a796531da375bd32af071ae4c sepolgen-1.0.3.tgz +1c75ba52423c0263de2f76eed8ea003e policycoreutils-2.0.7.tgz +0a95accabf65e1c151e42cacf535f320 sepolgen-1.0.4.tgz From fedora-cvs-commits at redhat.com Thu Mar 1 22:54:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 17:54:12 -0500 Subject: rpms/nfs-utils/FC-6 nfs-utils-1.0.10-mount-fake.patch, NONE, 1.1 nfs-utils-1.0.10-mount-mtablock.patch, NONE, 1.1 nfs-utils.spec, 1.116, 1.117 Message-ID: <200703012254.l21MsCRG029386@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv29323 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.0.10-mount-fake.patch nfs-utils-1.0.10-mount-mtablock.patch Log Message: * Thu Mar 1 2007 Karel Zak 1.0.10-6 - Fixed mount.nfs option -f (bz 227988) - Fixed mount.nfs mtab lock (bc 227985) nfs-utils-1.0.10-mount-fake.patch: mount.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) --- NEW FILE nfs-utils-1.0.10-mount-fake.patch --- --- nfs-utils-1.0.10/utils/mount/mount.c.kzak 2007-02-09 12:26:16.000000000 +0100 +++ nfs-utils-1.0.10/utils/mount/mount.c 2007-02-09 12:27:59.000000000 +0100 @@ -494,20 +494,21 @@ &extra_opts, &mount_opts, 0); } } - if (fake) - return 0; if (mnt_err) exit(EX_FAIL); - mnt_err = do_mount_syscall(spec, mount_point, - nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts); + if (!fake) { + mnt_err = do_mount_syscall(spec, mount_point, + nfs_mount_vers == 4 ? "nfs4" : "nfs", + flags, mount_opts); - if(mnt_err) { - mount_error(mount_point); - exit(EX_FAIL); + if (mnt_err) { + mount_error(mount_point); + exit(EX_FAIL); + } } - if(!nomtab) { + if (!nomtab) { add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, extra_opts, 0, 0); } nfs-utils-1.0.10-mount-mtablock.patch: mount.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) --- NEW FILE nfs-utils-1.0.10-mount-mtablock.patch --- --- nfs-utils-1.0.10/utils/mount/mount.c.kzak 2007-02-09 11:55:44.000000000 +0100 +++ nfs-utils-1.0.10/utils/mount/mount.c 2007-02-09 12:03:32.000000000 +0100 @@ -190,8 +190,8 @@ int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opts, int freq, int passno) { struct mntent ment; - int fd; FILE *mtab; + int res = 1; ment.mnt_fsname = fsname; ment.mnt_dir = mount_point; @@ -209,35 +209,23 @@ return 0; } - if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) { - fprintf(stderr, "Can't get "MOUNTED"~ lock file"); - return 1; - } - close(fd); + lock_mtab(); if ((mtab = setmntent(MOUNTED, "a+")) == NULL) { fprintf(stderr, "Can't open " MOUNTED); - return 1; + goto end; } if (addmntent(mtab, &ment) == 1) { fprintf(stderr, "Can't write mount entry"); - return 1; - } - - if (fchmod(fileno(mtab), 0644) == -1) { - fprintf(stderr, "Can't set perms on " MOUNTED); - return 1; + goto end; } endmntent(mtab); - - if (unlink(MOUNTED"~") == -1) { - fprintf(stderr, "Can't remove "MOUNTED"~"); - return 1; - } - - return 0; + res = 0; +end: + unlock_mtab(); + return res; } int do_mount_syscall(char *spec, char *node, char *type, int flags, void *data) Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- nfs-utils.spec 13 Dec 2006 14:53:21 -0000 1.116 +++ nfs-utils.spec 1 Mar 2007 22:54:10 -0000 1.117 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.10 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 # group all 32bit related archs @@ -46,6 +46,9 @@ Patch78: nfs-utils-1.0.10-mount-nfsvers.patch Patch79: nfs-utils-1.0.10-udp-no-connect.patch Patch80: nfs-utils-1.0.10-v4-umounts.patch +Patch81: nfs-utils-1.0.10-mount-fake.patch +Patch82: nfs-utils-1.0.10-mount-mtablock.patch + %if %{enablefscache} Patch90: nfs-utils-1.0.9-mount-fsc.patch @@ -113,6 +116,8 @@ %patch78 -p1 %patch79 -p1 %patch80 -p1 +%patch81 -p1 +%patch82 -p1 %if %{enablefscache} %patch90 -p1 %endif @@ -290,6 +295,10 @@ %endif %changelog +* Thu Mar 1 2007 Karel Zak 1.0.10-6 +- Fixed mount.nfs option -f (bz 227988) +- Fixed mount.nfs mtab lock (bc 227985) + * Wed Dec 13 2006 Steve Dickson 1.0.10-5 - Stopped v4 umounts from ping rpc.mountd (bz 215553) From fedora-cvs-commits at redhat.com Thu Mar 1 22:57:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 17:57:25 -0500 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch,1.24,1.25 Message-ID: <200703012257.l21MvP9j031828@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31676 Modified Files: policy-20061106.patch Log Message: * Thu Mar 1 2007 Dan Walsh 2.4.6-42 - Dontaudit restorecon writing to cron pipes Resolves: #229318 - Fix filespec for /dev/ub* - Allow ftp and telnet to use kerberos key files - Allow syslog to use alternate ports - Allow radious to look at the routing table - Allow pyzor to getattr on autofs policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 74 +++ 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 | 8 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 | 18 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 43 ++ 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 | 42 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++- policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 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 | 210 ++++++++- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 19 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 13 policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 152 +++++++ policy/modules/kernel/corenetwork.te.in | 17 policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 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 | 222 ++++++++++ policy/modules/kernel/filesystem.if | 43 +- policy/modules/kernel/filesystem.te | 13 policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 12 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 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 | 16 policy/modules/services/apache.if | 19 policy/modules/services/apache.te | 39 + 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 | 7 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 | 52 ++ policy/modules/services/cups.te | 7 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 62 ++ policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/ftp.te | 18 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 57 ++ policy/modules/services/hal.te | 22 - policy/modules/services/inetd.te | 28 + policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 3 policy/modules/services/kerberos.te | 13 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.fc | 1 policy/modules/services/mta.if | 1 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 30 + 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/openca.if | 4 policy/modules/services/openca.te | 2 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 | 28 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 1 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 21 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 | 23 + policy/modules/services/samba.te | 21 policy/modules/services/sasl.te | 2 policy/modules/services/sendmail.te | 8 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 | 4 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 18 policy/modules/services/squid.fc | 1 policy/modules/services/squid.if | 1 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 10 policy/modules/services/telnet.te | 3 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 | 76 +++ 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 | 63 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 107 +++++ policy/modules/system/iptables.te | 22 - policy/modules/system/libraries.fc | 38 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 22 - policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 ++ policy/modules/system/lvm.te | 78 +++ 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 | 68 +-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 37 + 219 files changed, 5005 insertions(+), 602 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- policy-20061106.patch 1 Mar 2007 22:32:04 -0000 1.24 +++ policy-20061106.patch 1 Mar 2007 22:57:22 -0000 1.25 @@ -6925,7 +6925,7 @@ + optional_policy(` kerberos_use(telnetd_t) -+ kerberos_read_keytab(ftpd_t) ++ kerberos_read_keytab(telnetd_t) ') optional_policy(` From fedora-cvs-commits at redhat.com Thu Mar 1 23:13:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 18:13:17 -0500 Subject: rpms/dhcp/FC-6 dhcp-3.0.5-no-win32.patch, NONE, 1.1 dhcp.spec, 1.119, 1.120 Message-ID: <200703012313.l21NDHRo011010@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10950 Modified Files: dhcp.spec Added Files: dhcp-3.0.5-no-win32.patch Log Message: * Thu Mar 01 2007 David Cantrell - 12:3.0.5-3 - Prevent package dependency on Win32API::Registry Perl module dhcp-3.0.5-no-win32.patch: Registry.pm | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE dhcp-3.0.5-no-win32.patch --- --- dhcp-3.0.5/contrib/ms2isc/Registry.pm.win32 2002-12-15 03:19:33.000000000 -0500 +++ dhcp-3.0.5/contrib/ms2isc/Registry.pm 2007-03-01 18:09:36.000000000 -0500 @@ -31,7 +31,10 @@ package Registry; use strict; -use Win32API::Registry 0.21 qw( :ALL ); + +# Uncomment the use Win32API line for this module to work. Make sure you have +# installed the libwin32 Perl module first. -- +#use Win32API::Registry 0.21 qw( :ALL ); ############################################################################### Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/FC-6/dhcp.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- dhcp.spec 1 Mar 2007 19:49:25 -0000 1.119 +++ dhcp.spec 1 Mar 2007 23:13:15 -0000 1.120 @@ -8,7 +8,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 12 License: distributable Group: System Environment/Daemons @@ -35,6 +35,7 @@ Patch11: dhcp-3.0.5-libdhcp4client.patch Patch12: dhcp-3.0.5-timeouts.patch Patch13: dhcp-3.0.5-fix-warnings.patch +Patch14: dhcp-3.0.5-no-win32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires(post): chkconfig, coreutils @@ -143,6 +144,9 @@ # Fix up anything that fails -Wall -Werror %patch13 -p1 -b .warnings +# Prevent package dependency on Win32API::Registry perl module +%patch14 -p1 -b .win32 + %build cp %SOURCE1 . cat <site.conf @@ -341,6 +345,9 @@ %{_libdir}/libdhcp4client.so %changelog +* Thu Mar 01 2007 David Cantrell - 12:3.0.5-3 +- Prevent package dependency on Win32API::Registry Perl module + * Thu Mar 01 2007 David Cantrell - 12:3.0.5-2 - Include contrib/ subdirectory in /usr/share/doc (#230476) - Remove invalid ja_JP.eucJP man pages from /usr/share/doc From fedora-cvs-commits at redhat.com Fri Mar 2 03:44:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 22:44:21 -0500 Subject: rpms/poppler/devel poppler.spec,1.36,1.37 Message-ID: <200703020344.l223iL4V009421@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/poppler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9407 Modified Files: poppler.spec Log Message: exclude poppler-qt-devel bits from poppler-devel Index: poppler.spec =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- poppler.spec 15 Dec 2006 14:25:48 -0000 1.36 +++ poppler.spec 2 Mar 2007 03:44:19 -0000 1.37 @@ -3,7 +3,7 @@ Summary: PDF rendering library Name: poppler Version: 0.5.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Development/Libraries URL: http://poppler.freedesktop.org/ @@ -103,7 +103,9 @@ %files devel %defattr(-,root,root,-) +%exclude %{_libdir}/pkgconfig/poppler-qt.pc %{_libdir}/pkgconfig/* +%exclude %{_libdir}/libpoppler-qt.so.* %{_libdir}/lib*.so %dir %{_includedir}/poppler/ %{_includedir}/poppler/glib/ @@ -127,6 +129,9 @@ %{_mandir}/man1/* %changelog +* Thu Mar 1 2007 Bill Nottingham - 0.5.4-6 +- fix it so the qt pkgconfig/.so aren't in the main poppler-devel + * Fri Dec 15 2006 Matthias Clasen - 0.5.4-5 - Include epoch in the Provides/Obsoletes for xpdf-utils From fedora-cvs-commits at redhat.com Fri Mar 2 04:02:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Mar 2007 23:02:28 -0500 Subject: rpms/poppler/devel poppler.spec,1.37,1.38 Message-ID: <200703020402.l2242SK7002850@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/poppler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2822 Modified Files: poppler.spec Log Message: nggh. typo. Index: poppler.spec =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- poppler.spec 2 Mar 2007 03:44:19 -0000 1.37 +++ poppler.spec 2 Mar 2007 04:02:25 -0000 1.38 @@ -3,7 +3,7 @@ Summary: PDF rendering library Name: poppler Version: 0.5.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Libraries URL: http://poppler.freedesktop.org/ @@ -105,7 +105,7 @@ %defattr(-,root,root,-) %exclude %{_libdir}/pkgconfig/poppler-qt.pc %{_libdir}/pkgconfig/* -%exclude %{_libdir}/libpoppler-qt.so.* +%exclude %{_libdir}/libpoppler-qt.so %{_libdir}/lib*.so %dir %{_includedir}/poppler/ %{_includedir}/poppler/glib/ @@ -129,7 +129,7 @@ %{_mandir}/man1/* %changelog -* Thu Mar 1 2007 Bill Nottingham - 0.5.4-6 +* Thu Mar 1 2007 Bill Nottingham - 0.5.4-7 - fix it so the qt pkgconfig/.so aren't in the main poppler-devel * Fri Dec 15 2006 Matthias Clasen - 0.5.4-5 From fedora-cvs-commits at redhat.com Fri Mar 2 10:30:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 05:30:23 -0500 Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.207,1.208 Message-ID: <200703021030.l22AUNqc018412@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18368/xorg-x11-server/devel Modified Files: xorg-x11-server.spec Log Message: changed perms of files in source package to default Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- xorg-x11-server.spec 26 Feb 2007 19:10:11 -0000 1.207 +++ xorg-x11-server.spec 2 Mar 2007 10:30:15 -0000 1.208 @@ -9,7 +9,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.2.0 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -352,8 +352,7 @@ cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/ find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl)$' | -xargs tar cf - --mode a=r | - (cd %{inst_srcdir} && tar xf -) +xargs tar cf - | (cd %{inst_srcdir} && tar xf -) # FIXME: Remove unwanted files/dirs { @@ -594,6 +593,9 @@ %changelog +* Fri Mar 02 2007 Adam Tkac 1.2.0-10 +- change permissions of files in source package to default from read-only + * Mon Feb 26 2007 Adam Tkac 1.2.0-9 - Created new package (xorg-x11-server-source) which is needed to build VNC server. From fedora-cvs-commits at redhat.com Fri Mar 2 12:01:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 07:01:07 -0500 Subject: rpms/man-pages-ru/devel man-pages-ru.spec, 1.13, 1.14 man-pages-ru-0.6-rofffix.patch, 1.1, NONE Message-ID: <200703021201.l22C17xY020964@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages-ru/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20925 Modified Files: man-pages-ru.spec Removed Files: man-pages-ru-0.6-rofffix.patch Log Message: - Resolves: 226129 incorporate package review feedback Index: man-pages-ru.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-ru/devel/man-pages-ru.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- man-pages-ru.spec 12 Jul 2006 07:19:26 -0000 1.13 +++ man-pages-ru.spec 2 Mar 2007 12:00:59 -0000 1.14 @@ -1,15 +1,14 @@ -Summary: Russian man pages from the Linux Documentation Project. +Summary: Russian man pages from the Linux Documentation Project Name: man-pages-ru Version: 0.97 -Release: 1.1.1 +Release: 2%{?dist} License: Distributable Group: Documentation URL: http://linuxshare.ru/projects/trans/ Source: manpages-ru-%{version}.rh.tar.bz2 Source2: http://alexm.here.ru/manpages-ru/download/manpages-ru-0.7.tar.gz Source3: http://linuxshare.ru/projects/trans/manpages-ru-%{version}.tar.bz2 -Patch0: man-pages-ru-0.6-rofffix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,12 +36,16 @@ rm -fr $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc NEWS README %dir %{_mandir}/ru %{_mandir}/ru/* %changelog +* Fri Mar 2 2007 Ivana Varekova - 0.97-2 +- Resolves: 226129 + incorporate package review feedback + * Wed Jul 12 2006 Jesse Keating - 0.97-1.1.1 - rebuild @@ -74,17 +77,17 @@ * Thu May 23 2002 Tim Powers - automated rebuild -* Wed Mar 13 2002 Trond Eivind Glomsr?d 0.7-1 +* Wed Mar 13 2002 Trond Eivind Glomsr??d 0.7-1 - 0.7 -* Thu Aug 2 2001 Trond Eivind Glomsr?d +* Thu Aug 2 2001 Trond Eivind Glomsr??d - s/Copyright/License/ - Own %%{_mandir}/ru -* Wed Apr 4 2001 Trond Eivind Glomsr?d +* Wed Apr 4 2001 Trond Eivind Glomsr??d - roff fixes -* Mon Feb 5 2001 Trond Eivind Glomsr?d +* Mon Feb 5 2001 Trond Eivind Glomsr??d - Version 0.6 * Wed Jul 12 2000 Prospector @@ -93,5 +96,5 @@ * Tue Jun 20 2000 Jeff Johnson - rebuild to compress man pages. -* Sun Jun 11 2000 Trond Eivind Glomsr?d +* Sun Jun 11 2000 Trond Eivind Glomsr??d - first build --- man-pages-ru-0.6-rofffix.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 12:04:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 07:04:57 -0500 Subject: rpms/dovecot/FC-5 dovecot-1.0.beta8-master-login-fix.patch, NONE, 1.1 dovecot.spec, 1.53, 1.54 Message-ID: <200703021204.l22C4voe021121@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/dovecot/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21106 Modified Files: dovecot.spec Added Files: dovecot-1.0.beta8-master-login-fix.patch Log Message: * Fri Mar 02 2007 Tomas Janousek - 1.0-0.beta8.4.fc5 - a little master login fix (#224925) dovecot-1.0.beta8-master-login-fix.patch: mech-plain.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE dovecot-1.0.beta8-master-login-fix.patch --- --- dovecot-1.0.beta8/src/auth/mech-plain.c.master-login-fix 2006-02-21 04:00:17.000000000 +0100 +++ dovecot-1.0.beta8/src/auth/mech-plain.c 2007-02-28 15:43:50.000000000 +0100 @@ -50,6 +50,11 @@ } } + if (strcmp(authid, authenid) == 0) { + /* the login username isn't different */ + authid = ""; + } + if (count != 2) { /* invalid input */ auth_request_log_info(request, "plain", "invalid input"); Index: dovecot.spec =================================================================== RCS file: /cvs/dist/rpms/dovecot/FC-5/dovecot.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- dovecot.spec 21 Dec 2006 13:32:56 -0000 1.53 +++ dovecot.spec 2 Mar 2007 12:04:55 -0000 1.54 @@ -1,7 +1,7 @@ Summary: Dovecot Secure imap server Name: dovecot Version: 1.0 -Release: 0.beta8.3.fc5 +Release: 0.beta8.4.fc5 License: LGPL Group: System Environment/Daemons @@ -30,6 +30,8 @@ #Patch105: dovecot-auth-log.patch # Patches 500+ from upstream fixes +Patch500: dovecot-1.0.beta8-master-login-fix.patch + URL: http://www.dovecot.org/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: openssl-devel @@ -76,6 +78,7 @@ #%patch105 -p1 -b .sqlite-check %patch106 -p1 -b .mkcert-paths %patch107 -p1 -b .file-cache-bof +%patch500 -p1 -b .master-login-fix %build rm -f ./configure @@ -216,6 +219,9 @@ %changelog +* Fri Mar 02 2007 Tomas Janousek - 1.0-0.beta8.4.fc5 +- a little master login fix (#224925) + * Thu Dec 21 2006 Tomas Janousek - 1.0-0.beta8.3.fc5 - fixed default paths in the example mkcert.sh to match configuration defaults (fixes #183151) From fedora-cvs-commits at redhat.com Fri Mar 2 12:23:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 07:23:05 -0500 Subject: rpms/man-pages-pl/devel man-pages-pl.spec, 1.21, 1.22 man-pages-pl-0.22-roffix.patch, 1.1, NONE Message-ID: <200703021223.l22CN5mJ014426@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages-pl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14379 Modified Files: man-pages-pl.spec Removed Files: man-pages-pl-0.22-roffix.patch Log Message: - Resolves: 226128 incorporate the package review feedback Index: man-pages-pl.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-pl/devel/man-pages-pl.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- man-pages-pl.spec 12 Jul 2006 07:19:19 -0000 1.21 +++ man-pages-pl.spec 2 Mar 2007 12:23:02 -0000 1.22 @@ -1,24 +1,21 @@ %define releasedate 24-10-2005 -Summary: Polish man pages from the Linux Documentation Project. +Summary: Polish man pages from the Linux Documentation Project Name: man-pages-pl Version: 0.24 -Release: 2.1 +Release: 3%{?dist} License: Distributable Group: Documentation Source: http://dione.ids.pl/~pborys/PTM/man-PL%{releasedate}.tar.gz -#Patch0: man-pages-pl-0.22-roffix.patch Patch1: man-pages-pl-0.24-pidof.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch - %description Manual pages from the Linux Documentation Project, translated into Polish. %prep %setup -q -n pl_PL -#%patch0 -p1 -b .rofffix %patch1 -p1 %build @@ -55,12 +52,16 @@ rm -fr $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc FAQ %dir %{_mandir}/pl %{_mandir}/pl/* %changelog +* Fri Mar 2 2007 Ivana Varekova - 0.24-3 +- Resolves: 226128 + incorporate package review feedback + * Wed Jul 12 2006 Jesse Keating - 0.24-2.1 - rebuild @@ -115,11 +116,11 @@ * Wed Jan 09 2002 Tim Powers - automated rebuild -* Thu Aug 2 2001 Trond Eivind Glomsr?d +* Thu Aug 2 2001 Trond Eivind Glomsr??d - s/Copyright/License/ - Own %%{_mandir}/pl -* Wed Apr 4 2001 Trond Eivind Glomsr?d +* Wed Apr 4 2001 Trond Eivind Glomsr??d - fix roff errors in various man pages (#34189) - remove lisp-tut.5 - it's beyond repair and needs rewriting @@ -129,10 +130,10 @@ * Tue Jun 20 2000 Jeff Johnson - rebuild to compress man pages. -* Mon Jun 19 2000 Trond Eivind Glomsr?d +* Mon Jun 19 2000 Trond Eivind Glomsr??d - don't include rpm manpage, it's included with rpm -* Sun Jun 11 2000 Trond Eivind Glomsr?d +* Sun Jun 11 2000 Trond Eivind Glomsr??d - fixed typo in description -* Sun Jun 11 2000 Trond Eivind Glomsr?d +* Sun Jun 11 2000 Trond Eivind Glomsr??d - first build --- man-pages-pl-0.22-roffix.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 12:46:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 07:46:15 -0500 Subject: rpms/man-pages-da/devel man-pages-da.spec,1.11,1.12 Message-ID: <200703021246.l22CkFeo006086@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages-da/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5655 Modified Files: man-pages-da.spec Log Message: - Resolves: 226122 incorporate package review feedback Index: man-pages-da.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-da/devel/man-pages-da.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- man-pages-da.spec 12 Jul 2006 07:18:37 -0000 1.11 +++ man-pages-da.spec 2 Mar 2007 12:46:12 -0000 1.12 @@ -1,16 +1,15 @@ -Summary: Danish man pages from the Linux Documentation Project. +Summary: Danish man pages from the Linux Documentation Project Name: man-pages-da Version: 0.1.1 -Release: 12.1.1 +Release: 13%{?dist} License: Distributable Group: Documentation Patch: manpages-da-0.1.1-manpath.patch URL: http://www.sslug.dk/locale/man-sider/ Source: http://www.sslug.dk/locale/man-sider/manpages-da-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch - %description Manual pages from the Linux Documentation Project, translated into Danish. @@ -33,12 +32,16 @@ rm -fr $RPM_BUILD_ROOT %files -%defattr(-,root,root) -%doc l?smig AUTHORS ChangeLog +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog %dir %{_mandir}/da %{_mandir}/da/* %changelog +* Fri Mar 2 2007 Ivana Varekova - 0.1.1-13 +- Resolves: 226122 + incorporate package review feedback + * Wed Jul 12 2006 Jesse Keating - 0.1.1-12.1.1 - rebuild @@ -72,12 +75,12 @@ * Tue Aug 14 2001 Tim Powers - rebuilt to hopefully fix the rpm verify problems -* Thu Aug 2 2001 Trond Eivind Glomsr?d +* Thu Aug 2 2001 Trond Eivind Glomsr??d - s/Copyright/License/ - Own %%{_mandir}/da * Wed Jul 12 2000 Prospector - automatic rebuild -* Sun Jul 02 2000 Trond Eivind Glomsr?d +* Sun Jul 02 2000 Trond Eivind Glomsr??d - rpmify From fedora-cvs-commits at redhat.com Fri Mar 2 12:53:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 07:53:45 -0500 Subject: rpms/kasumi/devel .cvsignore, 1.7, 1.8 kasumi.spec, 1.19, 1.20 sources, 1.6, 1.7 kasumi-2.0.1-errorcode.patch, 1.1, NONE kasumi.desktop, 1.2, NONE Message-ID: <200703021253.l22CrjZU004705@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/kasumi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4652 Modified Files: .cvsignore kasumi.spec sources Removed Files: kasumi-2.0.1-errorcode.patch kasumi.desktop Log Message: * Fri Mar 2 2007 Akira TAGOH - 2.2-1 - Updated to 2.2 - Remove kasumi-2.0.1-errorcode.patch. no longer needed. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kasumi/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jun 2006 03:59:46 -0000 1.7 +++ .cvsignore 2 Mar 2007 12:53:43 -0000 1.8 @@ -7,3 +7,4 @@ kasumi-1.0.tar.gz kasumi-2.0.tar.gz kasumi-2.0.1.tar.gz +kasumi-2.2.tar.gz Index: kasumi.spec =================================================================== RCS file: /cvs/dist/rpms/kasumi/devel/kasumi.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- kasumi.spec 12 Jul 2006 06:36:28 -0000 1.19 +++ kasumi.spec 2 Mar 2007 12:53:43 -0000 1.20 @@ -1,15 +1,13 @@ Name: kasumi -Version: 2.0.1 -Release: 1.1%{?dist} +Version: 2.2 +Release: 1%{?dist} License: GPL URL: http://kasumi.sourceforge.jp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf Source0: %{name}-%{version}.tar.gz -Source1: %{name}.desktop Patch0: kasumi-1.0-gcc41.patch -Patch1: kasumi-2.0.1-errorcode.patch Summary: An anthy dictionary management tool. @@ -20,11 +18,10 @@ %prep %setup -q -%patch0 -p1 -b .gcc41 -%patch1 -p1 -b .errcode -aclocal -automake --add-missing -autoconf +#%%patch0 -p1 -b .gcc41 +#aclocal +#automake --add-missing +#autoconf %build %configure @@ -39,7 +36,8 @@ --vendor fedora \ --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE1} + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} @@ -52,13 +50,18 @@ %files -f %{name}.lang %defattr(-,root,root, -) %{_bindir}/kasumi -%{_datadir}/kasumi +%{_mandir}/man1/kasumi.1* +%{_datadir}/pixmaps/kasumi.png %{_datadir}/applications/fedora-kasumi.desktop %doc AUTHORS COPYING ChangeLog NEWS README %changelog -* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +* Fri Mar 2 2007 Akira TAGOH - 2.2-1 +- Updated to 2.2 +- Remove kasumi-2.0.1-errorcode.patch. no longer needed. + +* Wed Jul 12 2006 Jesse Keating - 2.0.1-1.1 - rebuild * Fri Jun 30 2006 Akira TAGOH - 2.0.1-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kasumi/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jun 2006 03:59:46 -0000 1.6 +++ sources 2 Mar 2007 12:53:43 -0000 1.7 @@ -1 +1 @@ -03c03a261c63d2c8cd4bdcc77a55d7eb kasumi-2.0.1.tar.gz +d0c3a605fc95b89d4e102ffdd0b4c37d kasumi-2.2.tar.gz --- kasumi-2.0.1-errorcode.patch DELETED --- --- kasumi.desktop DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 13:03:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 08:03:57 -0500 Subject: rpms/man-pages-cs/devel man-pages-cs.spec, 1.14, 1.15 man-pages-cs-0.14-hyphen.patch, 1.1, NONE Message-ID: <200703021303.l22D3vvQ012060@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages-cs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11788 Modified Files: man-pages-cs.spec Removed Files: man-pages-cs-0.14-hyphen.patch Log Message: - Resolves: 226121 incorporate the package review feedback Index: man-pages-cs.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-cs/devel/man-pages-cs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- man-pages-cs.spec 11 Aug 2006 06:57:05 -0000 1.14 +++ man-pages-cs.spec 2 Mar 2007 13:03:55 -0000 1.15 @@ -1,15 +1,13 @@ -Summary: Czech man pages from the Linux Documentation Project. +Summary: Czech man pages from the Linux Documentation Project Name: man-pages-cs Version: 0.16 -Release: 6 -Patch0: man-pages-cs-0.14-hyphen.patch +Release: 7%{?dist} License: Distributable Group: Documentation Source: ftp://ftp.linux.cz/pub/linux/localization/czman/man-pages-cs-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch - %description Manual pages from the Linux Documentation Project, translated into Czech. @@ -35,12 +33,16 @@ rm -fr $RPM_BUILD_ROOT %files -%defattr(-,root,root) -%doc CONTRIB README README.Czech man-pages-cs-*.lsm +%defattr(-,root,root,-) +%doc CONTRIB README README.Czech %dir %{_mandir}/cs %{_mandir}/cs/* %changelog +* Fri Mar 2 2007 Ivana Varekova - 0.16-7 +- Resolves: 226121 + incorporate the package review feedback + * Fri Aug 11 2006 Ivana Varekova - 0.16-6 - remove at.1 man page to right directory (#202049) @@ -84,14 +86,14 @@ * Tue Aug 14 2001 Tim Powers - rebuilt to hopefully fix the rpm verify problem -* Thu Aug 2 2001 Trond Eivind Glomsr?d +* Thu Aug 2 2001 Trond Eivind Glomsr??d - s/Copyright/License/ - Own %%{_mandir}/cs -* Tue Apr 3 2001 Trond Eivind Glomsr?d +* Tue Apr 3 2001 Trond Eivind Glomsr??d - make pdf2dsc(1) use hyphen.cs, not hyphens.cs (#34181) -* Tue Dec 19 2000 Trond Eivind Glomsr?d +* Tue Dec 19 2000 Trond Eivind Glomsr??d - 0.14 - new location @@ -101,5 +103,5 @@ * Tue Jun 20 2000 Jeff Johnson - rebuild to compress man pages. -* Sun Jun 11 2000 Trond Eivind Glomsr?d +* Sun Jun 11 2000 Trond Eivind Glomsr??d - first build --- man-pages-cs-0.14-hyphen.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 13:06:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 08:06:03 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1082,1.1083 Message-ID: <200703021306.l22D63PY013720@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13673 Modified Files: openoffice.org.spec Log Message: set an -finline-limit Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1082 retrieving revision 1.1083 diff -u -r1.1082 -r1.1083 --- openoffice.org.spec 1 Mar 2007 08:42:48 -0000 1.1082 +++ openoffice.org.spec 2 Mar 2007 13:06:00 -0000 1.1083 @@ -1,6 +1,6 @@ %define oootag OOF680 %define ooomilestone 9 -%define rh_rpm_release 1.0 +%define rh_rpm_release 2 # gcc#19664# %define stlvisibilityfcked 1 @@ -307,7 +307,7 @@ Summary: Afrikaans language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-af +# Requires: hunspell-af Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org-langpack-af Obsoletes: openoffice.org2-langpack-af_ZA @@ -330,7 +330,7 @@ Summary: Bulgarian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-bg +# Requires: hunspell-bg Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org-langpack-bg Obsoletes: openoffice.org2-langpack-bg_BG @@ -354,7 +354,7 @@ Summary: Catalan language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-ca +# Requires: hunspell-ca Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org-langpack-ca Obsoletes: openoffice.org2-langpack-ca_ES @@ -377,7 +377,7 @@ Summary: Welsh language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-cy +# Requires: hunspell-cy Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org-langpack-cy Obsoletes: openoffice.org2-langpack-cy_GB @@ -390,7 +390,7 @@ Summary: Danish language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-da +# Requires: hunspell-da Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org-langpack-da Obsoletes: openoffice.org2-langpack-da_DK @@ -403,7 +403,7 @@ Summary: German language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-de +# Requires: hunspell-de Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-de @@ -415,7 +415,7 @@ Summary: Greek language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-el +# Requires: hunspell-el Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org-langpack-el Obsoletes: openoffice.org2-langpack-el_GR @@ -436,7 +436,7 @@ Summary: Spanish language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-es +# Requires: hunspell-es Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-es @@ -447,7 +447,7 @@ Summary: Estonian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-ee +# Requires: hunspell-ee Obsoletes: openoffice.org-langpack-et Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-et_EE @@ -481,7 +481,7 @@ Summary: French language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-fr +# Requires: hunspell-fr Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-fr @@ -492,7 +492,7 @@ Summary: Irish language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-ga +# Requires: hunspell-ga Obsoletes: openoffice.org2-langpack-ga_IE %description langpack-ga_IE @@ -502,7 +502,7 @@ Summary: Galician language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-gl +# Requires: hunspell-gl Obsoletes: openoffice.org-langpack-gl Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-gl_ES @@ -536,7 +536,7 @@ Summary: Hebrew language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-he +# Requires: hunspell-he Requires: fonts-hebrew Obsoletes: openoffice.org-langpack-he Obsoletes: openoffice.org-i18n @@ -561,7 +561,7 @@ Summary: Hungarian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-hu +# Requires: hunspell-hu Obsoletes: openoffice.org-langpack-hu Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-hu_HU @@ -573,7 +573,7 @@ Summary: Croatian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-hr +# Requires: hunspell-hr Obsoletes: openoffice.org-langpack-hr Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-hr_HR @@ -585,7 +585,7 @@ Summary: Italian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-it +# Requires: hunspell-it Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-it @@ -620,7 +620,7 @@ Summary: Lithuanian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-lt +# Requires: hunspell-lt Obsoletes: openoffice.org-langpack-lt Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-lt_LT @@ -632,7 +632,7 @@ Summary: Malay language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-ms +# Requires: hunspell-ms Obsoletes: openoffice.org-langpack-ms Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-ms_MY @@ -644,7 +644,7 @@ Summary: Bokmal language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-nb +# Requires: hunspell-nb Obsoletes: openoffice.org-langpack-nb Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-nb_NO @@ -656,7 +656,7 @@ Summary: Dutch language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-nl +# Requires: hunspell-nl Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-nl @@ -667,7 +667,7 @@ Summary: Nynorsk language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-nn +# Requires: hunspell-nn Obsoletes: openoffice.org-langpack-nn Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-nn_NO @@ -687,7 +687,7 @@ Summary: Polish language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-pl +# Requires: hunspell-pl Obsoletes: openoffice.org-langpack-pl Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-pl_PL @@ -699,7 +699,7 @@ Summary: Portuguese language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-pt +# Requires: hunspell-pt Obsoletes: openoffice.org-langpack-pt Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-pt_PT @@ -711,7 +711,7 @@ Summary: Brazilian Portuguese language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-pt +# Requires: hunspell-pt Obsoletes: openoffice.org-langpack-pt-BR Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-pt_BR @@ -723,7 +723,7 @@ Summary: Russian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-ru +# Requires: hunspell-ru Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-ru @@ -734,7 +734,7 @@ Summary: Slovak language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-sk +# Requires: hunspell-sk Obsoletes: openoffice.org-langpack-sk Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-sk_SK @@ -746,7 +746,7 @@ Summary: Slovenian language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-sl +# Requires: hunspell-sl Obsoletes: openoffice.org-langpack-sl Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-sl_SI @@ -783,7 +783,7 @@ Summary: Swedish language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-sv +# Requires: hunspell-sv Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-sv @@ -805,7 +805,7 @@ Summary: Thai language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-th +# Requires: hunspell-th Obsoletes: openoffice.org-langpack-th Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-th_TH @@ -897,7 +897,7 @@ Summary: Zulu language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-zu +# Requires: hunspell-zu Obsoletes: openoffice.org-langpack-zu Obsoletes: openoffice.org-i18n Obsoletes: openoffice.org2-langpack-zu_ZA @@ -2582,6 +2582,10 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Wed Mar 02 2007 Caolan McNamara - 1:2.2.0-9.2 +- jumped the run on requiring extras from a core package, back out for now +- -finline-limit=64 http://blogs.linux.ie/caolan/2007/03/02/finline-limit-and-ooo + * Mon Feb 26 2007 Caolan McNamara - 1:2.2.0-9.1 - next release candidate - add openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch to workaround strange From fedora-cvs-commits at redhat.com Fri Mar 2 13:15:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 08:15:23 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo63159.sal.dtype.patch, NONE, 1.1 openoffice.org.spec, 1.1083, 1.1084 Message-ID: <200703021315.l22DFNIL020951@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20906 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo63159.sal.dtype.patch Log Message: new experiment openoffice.org-2.2.0.ooo63159.sal.dtype.patch: openoffice.org/sal/osl/unx/file_impl.hxx | 18 ++++++++ sal/osl/unx/file.cxx | 64 ++++++++++++++++++++++++++++ sal/osl/unx/file_stat.cxx | 69 +++++++++++++++++++++++++++++-- 3 files changed, 148 insertions(+), 3 deletions(-) --- NEW FILE openoffice.org-2.2.0.ooo63159.sal.dtype.patch --- Index: sal/osl/unx/file.cxx =================================================================== RCS file: /cvs/porting/sal/osl/unx/file.cxx,v retrieving revision 1.10 diff -u -p -r1.10 file.cxx --- openoffice.org.orig/sal/osl/unx/file.cxx 8 Sep 2005 14:53:53 -0000 1.10 +++ openoffice.org/sal/osl/unx/file.cxx 18 Jan 2006 14:38:41 -0000 @@ -156,6 +156,42 @@ #endif +#ifdef _DIRENT_HAVE_D_TYPE +#include "file_impl.hxx" + oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType ) + { + oslDirectoryItemImpl *pItemObject = (oslDirectoryItemImpl*) malloc( sizeof( oslDirectoryItemImpl ) ); + pItemObject->RefCount = 1; + pItemObject->bHasType = _bHasDType; + pItemObject->DType = _DType; + pItemObject->ustrFilePath = _ustrFilePath; + + return pItemObject; + } + + void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem ) + { + if( pItem->ustrFilePath ) { + rtl_uString_release( pItem->ustrFilePath ); + pItem->ustrFilePath = NULL; + } + free( pItem ); + } + + void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem ) + { + pItem->RefCount ++; + } + + void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem ) + { + pItem->RefCount --; + + if( pItem->RefCount <= 0 ) + oslDirectoryItemImpl_Destroy( pItem ); + } +#endif + #if OSL_DEBUG_LEVEL > 1 extern void debug_ustring(rtl_uString*); @@ -484,8 +520,14 @@ osl_systemPathMakeAbsolutePath(pDirImpl->ustrPath, ustrFileName, &ustrFilePath); rtl_uString_release( ustrFileName ); +#ifdef _DIRENT_HAVE_D_TYPE + if(*pItem) + oslDirectoryItemImpl_release( ( oslDirectoryItemImpl* )( *pItem ) ); + *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrFilePath, true, pEntry->d_type ); +#else /* use path as directory item */ *pItem = (oslDirectoryItem) ustrFilePath; +#endif return osl_File_E_None; } @@ -514,7 +556,11 @@ if (0 == access_u(ustrSystemPath, F_OK)) { +#ifdef _DIRENT_HAVE_D_TYPE + *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrSystemPath, false ); +#else *pItem = (oslDirectoryItem)ustrSystemPath; +#endif osl_error = osl_File_E_None; } else @@ -532,12 +578,21 @@ oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item ) { +#ifdef _DIRENT_HAVE_D_TYPE + oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item; +#else rtl_uString* ustrFilePath = (rtl_uString *) Item; +#endif OSL_ASSERT( Item ); +#ifdef _DIRENT_HAVE_D_TYPE + if( pImpl ) + oslDirectoryItemImpl_acquire( pImpl ); +#else if( ustrFilePath ) rtl_uString_acquire( ustrFilePath ); +#endif return osl_File_E_None; } @@ -548,12 +603,21 @@ oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item ) { +#ifdef _DIRENT_HAVE_D_TYPE + oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item; +#else rtl_uString* ustrFilePath = (rtl_uString *) Item; +#endif OSL_ASSERT( Item ); +#ifdef _DIRENT_HAVE_D_TYPE + if( pImpl ) + oslDirectoryItemImpl_release( pImpl ); +#else if( ustrFilePath ) rtl_uString_release( ustrFilePath ); +#endif return osl_File_E_None; } Index: sal/osl/unx/file_stat.cxx =================================================================== RCS file: /cvs/porting/sal/osl/unx/file_stat.cxx,v retrieving revision 1.6 diff -u -p -r1.6 file_stat.cxx --- openoffice.org.orig/sal/osl/unx/file_stat.cxx 8 Sep 2005 14:56:14 -0000 1.6 +++ openoffice.org/sal/osl/unx/file_stat.cxx 18 Jan 2006 14:38:41 -0000 @@ -45,6 +45,10 @@ #include #endif +#ifndef _DIRENT_H +#include +#endif + #ifndef _OSL_FILE_H_ #include #endif @@ -69,6 +73,9 @@ #include "file_error_transl.h" #endif +#ifdef _DIRENT_HAVE_D_TYPE +#include "file_impl.hxx" +#endif namespace /* private */ { @@ -236,9 +243,19 @@ namespace /* private */ /* we only need to call stat or lstat if one of the following flags is set */ +#ifdef _DIRENT_HAVE_D_TYPE + inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslDirectoryItemImpl *pImpl) +#else inline bool is_stat_call_necessary(sal_uInt32 field_mask) +#endif { - return ((field_mask & osl_FileStatus_Mask_Type) || + return ( +/* on linux the dirent might have d_type */ +#ifdef _DIRENT_HAVE_D_TYPE + ((field_mask & osl_FileStatus_Mask_Type) && (!pImpl->bHasType || pImpl->DType == DT_UNKNOWN)) || +#else + (field_mask & osl_FileStatus_Mask_Type) || +#endif (field_mask & osl_FileStatus_Mask_Attributes) || (field_mask & osl_FileStatus_Mask_CreationTime) || (field_mask & osl_FileStatus_Mask_AccessTime) || @@ -267,7 +284,11 @@ namespace /* private */ if ((NULL == Item) || (NULL == pStat)) return osl_File_E_INVAL; +#ifdef _DIRENT_HAVE_D_TYPE + file_path = rtl::OUString(reinterpret_cast(((oslDirectoryItemImpl* ) Item)->ustrFilePath)); +#else file_path = rtl::OUString(reinterpret_cast(Item)); +#endif OSL_ASSERT(file_path.getLength() > 0); @@ -298,10 +319,18 @@ oslFileError SAL_CALL osl_getFileStatus( #else struct stat file_stat; #endif - if (is_stat_call_necessary(uFieldMask) && (0 != osl::lstat(file_path, file_stat))) + +#ifdef _DIRENT_HAVE_D_TYPE + oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item; + bool bStatNeeded = is_stat_call_necessary(uFieldMask, pImpl); +#else + bool bStatNeeded = is_stat_call_necessary(uFieldMask); +#endif + + if (bStatNeeded && (0 != osl::lstat(file_path, file_stat))) return oslTranslateFileError(OSL_FET_ERROR, errno); - if (is_stat_call_necessary(uFieldMask)) + if (bStatNeeded) { // we set all these attributes because it's cheap set_file_type(file_stat, pStat); @@ -318,6 +347,40 @@ oslFileError SAL_CALL osl_getFileStatus( return osl_error; } } +#ifdef _DIRENT_HAVE_D_TYPE + else if (uFieldMask & osl_FileStatus_Mask_Type) + { + OSL_ASSERT(pImpl->bHasType); + + switch(pImpl->DType) + { + case DT_LNK: + pStat->eType = osl_File_Type_Link; + break; + case DT_DIR: + pStat->eType = osl_File_Type_Directory; + break; + case DT_REG: + pStat->eType = osl_File_Type_Regular; + break; + case DT_FIFO: + pStat->eType = osl_File_Type_Fifo; + break; + case DT_SOCK: + pStat->eType = osl_File_Type_Socket; + break; + case DT_CHR: + case DT_BLK: + pStat->eType = osl_File_Type_Special; + break; + default: + OSL_ASSERT(0); + pStat->eType = osl_File_Type_Unknown; + } + + pStat->uValidFields |= osl_FileStatus_Mask_Type; + } +#endif if (uFieldMask & osl_FileStatus_Mask_FileURL) { Index: sal/osl/unx/file_impl.hxx =================================================================== --- /dev/null 2006-01-10 21:26:33.568399000 +0100 +++ openoffice.org/sal/osl/unx/file_impl.hxx 2006-01-17 20:05:30.000000000 +0100 @@ -0,0 +1,18 @@ +#ifdef __cplusplus +extern "C" { +#endif +typedef struct +{ + rtl_uString* ustrFilePath; /* holds native file name */ + unsigned char DType; + bool bHasType; + sal_uInt32 RefCount; +} oslDirectoryItemImpl; + + oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType=0 ); + void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem ); + void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem ); + void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem ); +#ifdef __cplusplus +} /* extern "C" */ +#endif Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1083 retrieving revision 1.1084 diff -u -r1.1083 -r1.1084 --- openoffice.org.spec 2 Mar 2007 13:06:00 -0000 1.1083 +++ openoffice.org.spec 2 Mar 2007 13:15:21 -0000 1.1084 @@ -1,6 +1,6 @@ %define oootag OOF680 %define ooomilestone 9 -%define rh_rpm_release 2 +%define rh_rpm_release 2.0 # gcc#19664# %define stlvisibilityfcked 1 @@ -124,6 +124,7 @@ Patch67: workspace.sixtyfour11.patch Patch68: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch Patch69: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch +Patch70: openoffice.org-2.2.0.ooo63159.sal.dtype.patch %define instdir %{_libdir}/openoffice.org @@ -1040,6 +1041,7 @@ %patch67 -p1 -b .workspace.sixtyfour11.patch %patch68 -p1 -b .gccXXXXX.solenv.javaregistration.patch %patch69 -p1 -b .ooo68717.gstreamer.video.patch +%patch70 -p1 -b .ooo63159.sal.dtype.patch cp %{SOURCE1} extras/source/database/evolocal.odb From fedora-cvs-commits at redhat.com Fri Mar 2 13:26:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 08:26:52 -0500 Subject: rpms/newt/devel .cvsignore, 1.20, 1.21 newt.spec, 1.45, 1.46 sources, 1.21, 1.22 Message-ID: <200703021326.l22DQqJ1022428@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/newt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22134 Modified Files: .cvsignore newt.spec sources Log Message: - add newtSetColor() to allow changing individual colors - add newtPopWindowNoRefresh() (patch by Forest Bond) - move static library to -static subpackage, spec cleanup (#226195) (patch by Jason Tibbitts) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/newt/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 31 Jan 2007 14:55:21 -0000 1.20 +++ .cvsignore 2 Mar 2007 13:26:50 -0000 1.21 @@ -1 +1 @@ -newt-0.52.5.tar.gz +newt-0.52.6.tar.gz Index: newt.spec =================================================================== RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- newt.spec 31 Jan 2007 14:55:21 -0000 1.45 +++ newt.spec 2 Mar 2007 13:26:50 -0000 1.46 @@ -1,19 +1,30 @@ -Summary: A development library for text mode user interfaces. +Summary: A development library for text mode user interfaces Name: newt -Version: 0.52.5 +Version: 0.52.6 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries +# The source for this package was pulled from upstream's vcs. Use the +# following commands to generate the tarball: +# cvs -d :pserver:anonymous at elvis.redhat.com:/usr/local/CVS co -r r0-52-6 newt +# cd newt; ./autogen.sh; ./configure; make create-archive Source: newt-%{version}.tar.gz BuildRequires: python, python-devel, slang-devel Provides: snack = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel -Summary: Newt windowing toolkit development files. +Summary: Newt windowing toolkit development files Requires: slang-devel %{name} = %{version} Group: Development/Libraries +# The loader portion of the installer needs to link statically against libnewt, +# so the static library must be shipped. +%package static +Summary: Newt windowing toolkit static library +Requires: newt-devel = %{version} +Group: Development/Libraries + %Description Newt is a programming library for color text mode, widget based user interfaces. Newt can be used to add stacked windows, entry widgets, @@ -32,12 +43,16 @@ Install newt-devel if you want to develop applications which will use newt. +%description static +The newt-static package contains the static version of the newt library. +Install it if you need to link statically with libnewt. + %prep %setup -q %build # gpm support seems to smash the stack w/ we use help in anaconda?? -#./configure --with-gpm-support +# --with-gpm-support %configure --without-tcl make %{?_smp_mflags} all chmod 0644 peanuts.py popcorn.py @@ -67,10 +82,18 @@ %defattr (-,root,root) %doc tutorial.sgml peanuts.py popcorn.py %{_includedir}/newt.h -%{_libdir}/libnewt.a %{_libdir}/libnewt.so +%files static +%{_libdir}/libnewt.a + %changelog +* Fri Mar 02 2007 Miroslav Lichvar - 0.52.6-1 +- add newtSetColor() to allow changing individual colors +- add newtPopWindowNoRefresh() (patch by Forest Bond) +- move static library to -static subpackage, spec cleanup (#226195) + (patch by Jason Tibbitts) + * 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) @@ -136,10 +159,10 @@ * Tue Jan 17 2006 Petr Rockai - 0.52.2-4 - Apply patch by Bill Nottingham (thanks) to improve scrollbar appearance (BR 174771). -- Add -%{release} to snack's Provides: line (just in case). +- Add -%%{release} to snack's Provides: line (just in case). * Tue Jan 17 2006 Petr Rockai - 0.52.2-3 -- Provide: snack = %{version} instead of plain "snack", so that +- Provide: snack = %%{version} instead of plain "snack", so that we don't block upgrades of custom "snack" packages. This should not break anything. (Hopefully) fixes BR 171415. @@ -255,11 +278,11 @@ * Mon Mar 18 2002 Bill Nottingham 0.50.35-1 - build for whatever version of python happens to be installed -* Fri Sep 15 2001 Trond Eivind Glomsr?d 0.50.34-1 +* Fri Sep 15 2001 Trond Eivind Glomsr??d 0.50.34-1 - remove python2 subpackage - compile package for python 2.2 -* Wed Aug 29 2001 Trond Eivind Glomsr?d 0.50.33-1 +* Wed Aug 29 2001 Trond Eivind Glomsr??d 0.50.33-1 - s/Copyright/License/ - Add slang-devel to build dependencies (#49542) @@ -330,12 +353,12 @@ * Mon Jan 22 2001 Than Ngo - don't build newt-python2 sub package. -* Fri Dec 15 2000 Trond Eivind Glomsr?d +* Fri Dec 15 2000 Trond Eivind Glomsr??d - use %%{_tmppath} - add python2 subpackage, with such support - fix use of append in snack.py -* Fri Sep 08 2000 Trond Eivind Glomsr?d +* Fri Sep 08 2000 Trond Eivind Glomsr??d - bytecompile the snack python module - move the libnewt.so symlink to the devel package - include popcorn.py and peanuts.py in the devel package, Index: sources =================================================================== RCS file: /cvs/dist/rpms/newt/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 31 Jan 2007 14:55:22 -0000 1.21 +++ sources 2 Mar 2007 13:26:50 -0000 1.22 @@ -1 +1 @@ -492e09cc6845a476074c5817038cbdd8 newt-0.52.5.tar.gz +7cfe94ca483aae7ae31c26387f146b6c newt-0.52.6.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 2 13:42:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 08:42:01 -0500 Subject: rpms/rpm/devel rpm.spec,1.222,1.223 Message-ID: <200703021342.l22Dg1lE024157@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24143 Modified Files: rpm.spec Log Message: Clean ups for merge Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- rpm.spec 19 Feb 2007 17:00:41 -0000 1.222 +++ rpm.spec 2 Mar 2007 13:41:59 -0000 1.223 @@ -1,28 +1,28 @@ -%define with_python_subpackage 1%{nil} -%define with_python_version 2.5%{nil} -%define with_bzip2 1%{nil} -%define with_apidocs 1%{nil} +%define with_python_subpackage 1%{nil} +%define with_python_version 2.5%{nil} +%define with_apidocs 1%{nil} # XXX legacy requires './' payload prefix to be omitted from rpm packages. -%define _noPayloadPrefix 1 +%define _noPayloadPrefix 1 -%define __prefix %{?_prefix}%{!?_prefix:/usr} +%define __prefix %{?_prefix}%{!?_prefix:/usr} %{?!_lib: %define _lib lib} %{expand: %%define __share %(if [ -d %{__prefix}/share/man ]; then echo /share ; else echo %%{nil} ; fi)} -%define __bindir %{__prefix}/bin -%define __includedir %{__prefix}/include -%define __libdir %{__prefix}/%{_lib} -%define __mandir %{__prefix}%{__share}/man +%define __bindir %{__prefix}/bin +%define __includedir %{__prefix}/include +%define __libdir %{__prefix}/%{_lib} +%define __mandir %{__prefix}%{__share}/man -Summary: The RPM package management system. +Summary: The RPM package management system Name: rpm %define version 4.4.2 Version: %{version} %{expand: %%define rpm_version %{version}} Release: 40%{?dist} Group: System Environment/Base -Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz +Url: http://www.rpm.org/ +Source: rpm-%{rpm_version}.tar.gz Source1: mono-find-provides Source2: mono-find-requires Patch0: rpm-4.4.1-hkp-disable.patch @@ -63,18 +63,16 @@ Patch35: rpm-4.4.2-query-flushbuffer.patch Patch36: rpm-4.4.2-unicodekey.patch License: GPL -Conflicts: patch < 2.5 -%ifos linux -Prereq: fileutils shadow-utils -%endif +Requires: patch > 2.5 +Prereq: shadow-utils Requires: popt = 1.10.2 -Obsoletes: rpm-perl < %{version} +Requires: crontab BuildRequires: autoconf BuildRequires: elfutils-devel >= 0.112 BuildRequires: elfutils-libelf-devel-static -BuildRequires: sed readline-devel zlib-devel +BuildRequires: readline-devel zlib-devel BuildRequires: beecrypt-devel >= 4.1.2 Requires: beecrypt >= 4.1.2 @@ -83,13 +81,9 @@ BuildRequires: sqlite-devel BuildRequires: gettext-devel BuildRequires: libselinux-devel -#XXX: lua fix this BuildRequires: ncurses-devel - -# XXX Red Hat 5.2 has not bzip2 or python -%if %{with_bzip2} BuildRequires: bzip2-devel >= 0.9.0c-2 -%endif + %if %{with_python_subpackage} BuildRequires: python-devel >= %{with_python_version} %endif @@ -104,7 +98,7 @@ the package like its version, a description, etc. %package libs -Summary: Libraries for manipulating RPM packages. +Summary: Libraries for manipulating RPM packages Group: Development/Libraries Requires: rpm = %{rpm_version}-%{release} @@ -112,7 +106,7 @@ This package contains the RPM shared libraries. %package devel -Summary: Development files for manipulating RPM packages. +Summary: Development files for manipulating RPM packages Group: Development/Libraries Requires: rpm = %{rpm_version}-%{release} Requires: beecrypt >= 4.1.2 @@ -133,7 +127,7 @@ will manipulate RPM packages and databases. %package build -Summary: Scripts and executable programs used to build packages. +Summary: Scripts and executable programs used to build packages Group: Development/Tools Requires: rpm = %{rpm_version}-%{release}, patch >= 2.5, file, elfutils Requires: findutils @@ -145,10 +139,9 @@ %if %{with_python_subpackage} %package python -Summary: Python bindings for apps which will manipulate RPM packages. +Summary: Python bindings for apps which will manipulate RPM packages Group: Development/Libraries Requires: rpm = %{rpm_version}-%{release} -Requires: python >= %{with_python_version} %description python The rpm-python package contains a module that permits applications @@ -160,7 +153,7 @@ %endif %package -n popt -Summary: A C library for parsing command line parameters. +Summary: A C library for parsing command line parameters Group: Development/Libraries Version: 1.10.2 @@ -228,17 +221,8 @@ WITH_PYTHON="--without-python" %endif -%ifos linux CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS -./configure --prefix=%{__prefix} --sysconfdir=/etc \ - --localstatedir=/var --infodir='${prefix}%{__share}/info' \ - --mandir='${prefix}%{__share}/man' \ - $WITH_PYTHON --enable-posixmutexes --without-javaglue -%else -export CPPFLAGS=-I%{__prefix}/include -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} $WITH_PYTHON \ - --without-javaglue -%endif +%configure $WITH_PYTHON --enable-posixmutexes --without-javaglue make -C zlib || : @@ -256,9 +240,9 @@ # workaround to #132435, # and from linking to included zlib for i in librpm.la librpmbuild.la librpmdb.la librpmio.la ; do - sed -i -e 's~-L'"$RPM_BUILD_ROOT"'[^ ]* ~~g' \ - -e 's~-L'"$RPM_BUILD_DIR"'[^ ]* ~~g' \ - "$RPM_BUILD_ROOT%{__libdir}/$i" + sed -i -e 's~-L'"$RPM_BUILD_ROOT"'[^ ]* ~~g' \ + -e 's~-L'"$RPM_BUILD_DIR"'[^ ]* ~~g' \ + "$RPM_BUILD_ROOT%{__libdir}/$i" done # Clean up dangling symlinks @@ -272,8 +256,6 @@ rm -f "$RPM_BUILD_ROOT"/"$i" done -%ifos linux - # Save list of packages through cron mkdir -p ${RPM_BUILD_ROOT}/etc/cron.daily install -m 755 scripts/rpm.daily ${RPM_BUILD_ROOT}/etc/cron.daily/rpm @@ -286,21 +268,15 @@ mkdir -p $RPM_BUILD_ROOT/var/spool/repackage mkdir -p $RPM_BUILD_ROOT/var/lib/rpm for dbi in \ - Basenames Conflictname Dirnames Group Installtid Name Packages \ - Providename Provideversion Requirename Requireversion Triggername \ - Filemd5s Pubkeys Sha1header Sigmd5 \ - __db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \ - __db.008 __db.009 + Basenames Conflictname Dirnames Group Installtid Name Packages \ + Providename Provideversion Requirename Requireversion Triggername \ + Filemd5s Pubkeys Sha1header Sigmd5 \ + __db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \ + __db.008 __db.009 do touch $RPM_BUILD_ROOT/var/lib/rpm/$dbi done -%endif - -%if %{with_apidocs} -gzip -9n apidocs/man/man*/* || : -%endif - # Get rid of unpackaged files { cd $RPM_BUILD_ROOT rm -f .%{_libdir}/lib*.la @@ -321,25 +297,21 @@ rm -rf $RPM_BUILD_ROOT %pre -%ifos linux if [ -f /var/lib/rpm/packages.rpm ]; then echo " You have (unsupported) - /var/lib/rpm/packages.rpm db1 format installed package headers + /var/lib/rpm/packages.rpm db1 format installed package headers Please install rpm-4.0.4 first, and do - rpm --rebuilddb + rpm --rebuilddb to convert your database from db1 to db3 format. " exit 1 fi -/usr/sbin/groupadd -g 37 rpm > /dev/null 2>&1 -/usr/sbin/useradd -r -d /var/lib/rpm -u 37 -g 37 rpm -s /sbin/nologin > /dev/null 2>&1 -%endif +/usr/sbin/groupadd -g 37 rpm > /dev/null 2>&1 +/usr/sbin/useradd -r -d /var/lib/rpm -u 37 -g 37 rpm -s /sbin/nologin > /dev/null 2>&1 exit 0 %post -%ifos linux - # Establish correct rpmdb ownership. /bin/chown rpm.rpm /var/lib/rpm/[A-Z]* @@ -349,12 +321,10 @@ [ -w /var/lib/rpm/__db.001 ] && /usr/lib/rpm/rpmdb_stat -CA -h /var/lib/rpm 2>&1 | grep "db_stat: Program version 4.3 doesn't match environment version" 2>&1 > /dev/null && - rm -f /var/lib/rpm/__db* + rm -f /var/lib/rpm/__db* -%endif exit 0 -%ifos linux %postun if [ $1 = 0 ]; then /usr/sbin/userdel rpm @@ -370,120 +340,112 @@ %post -n popt -p /sbin/ldconfig %postun -n popt -p /sbin/ldconfig -%endif -%if %{with_python_subpackage} -%post python -p /sbin/ldconfig -%postun python -p /sbin/ldconfig -%endif - -%define rpmattr %attr(0755, rpm, rpm) +%define rpmattr %attr(0755, rpm, rpm) %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc RPM-PGP-KEY RPM-GPG-KEY BETA-GPG-KEY CHANGES GROUPS doc/manual/[a-z]* # XXX comment these lines out if building with rpm that knows not %pubkey attr %pubkey RPM-PGP-KEY %pubkey RPM-GPG-KEY %pubkey BETA-GPG-KEY -%attr(0755, rpm, rpm) /bin/rpm +%attr(0755, rpm, rpm) /bin/rpm -%ifos linux -%config(noreplace,missingok) /etc/cron.daily/rpm -%config(noreplace,missingok) /etc/logrotate.d/rpm -%dir /etc/rpm -#%config(noreplace,missingok) /etc/rpm/macros.* -%attr(0755, rpm, rpm) %dir /var/lib/rpm -%attr(0755, rpm, rpm) %dir /var/spool/repackage - -%define rpmdbattr %attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) -%rpmdbattr /var/lib/rpm/* -%endif - -%rpmattr %{__bindir}/rpm2cpio -%rpmattr %{__bindir}/gendiff -%rpmattr %{__bindir}/rpmdb -#%rpmattr %{__bindir}/rpm[eiu] -%rpmattr %{__bindir}/rpmsign -%rpmattr %{__bindir}/rpmquery -%rpmattr %{__bindir}/rpmverify - -%attr(0755, rpm, rpm) %dir %{__prefix}/lib/rpm -%rpmattr %{__prefix}/lib/rpm/config.guess -%rpmattr %{__prefix}/lib/rpm/config.sub -%rpmattr %{__prefix}/lib/rpm/convertrpmrc.sh -%rpmattr %{__prefix}/lib/rpm/freshen.sh -%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/macros -%rpmattr %{__prefix}/lib/rpm/mkinstalldirs -%rpmattr %{__prefix}/lib/rpm/rpm.* -%rpmattr %{__prefix}/lib/rpm/rpm2cpio.sh -%rpmattr %{__prefix}/lib/rpm/rpm[deiukqv] -%rpmattr %{__prefix}/lib/rpm/tgpg -%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/rpmpopt* -%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/rpmrc +/etc/cron.daily/rpm +%config(noreplace,missingok) /etc/logrotate.d/rpm +%dir /etc/rpm +#%config(noreplace,missingok) /etc/rpm/macros.* +%attr(0755, rpm, rpm) %dir /var/lib/rpm +%attr(0755, rpm, rpm) %dir /var/spool/repackage + +%define rpmdbattr %attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) +%rpmdbattr /var/lib/rpm/* + +%rpmattr %{__bindir}/rpm2cpio +%rpmattr %{__bindir}/gendiff +%rpmattr %{__bindir}/rpmdb +#%rpmattr %{__bindir}/rpm[eiu] +%rpmattr %{__bindir}/rpmsign +%rpmattr %{__bindir}/rpmquery +%rpmattr %{__bindir}/rpmverify + +%attr(0755, rpm, rpm) %dir %{__prefix}/lib/rpm +%rpmattr %{__prefix}/lib/rpm/config.guess +%rpmattr %{__prefix}/lib/rpm/config.sub +%rpmattr %{__prefix}/lib/rpm/convertrpmrc.sh +%rpmattr %{__prefix}/lib/rpm/freshen.sh +%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/macros +%rpmattr %{__prefix}/lib/rpm/mkinstalldirs +%rpmattr %{__prefix}/lib/rpm/rpm.* +%rpmattr %{__prefix}/lib/rpm/rpm2cpio.sh +%rpmattr %{__prefix}/lib/rpm/rpm[deiukqv] +%rpmattr %{__prefix}/lib/rpm/tgpg +%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/rpmpopt* +%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/rpmrc %ifarch i386 i486 i586 i686 athlon pentium3 pentium4 -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/i[3456]86* -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/athlon* -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/pentium* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/i[3456]86* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/athlon* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/pentium* %endif %ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67 -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/alpha* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/alpha* %endif %ifarch sparc sparcv8 sparcv9 sparc64 -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/sparc* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/sparc* %endif %ifarch ia64 -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/ia64* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/ia64* %endif %ifarch powerpc ppc ppciseries ppcpseries ppcmac ppc64 -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/ppc* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/ppc* %endif %ifarch s390 s390x -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/s390* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/s390* %endif %ifarch armv3l armv4l -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/armv[34][lb]* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/armv[34][lb]* %endif %ifarch mips mipsel -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/mips* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/mips* %endif %ifarch x86_64 -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/x86_64* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/x86_64* %endif -%attr(-, rpm, rpm) %{__prefix}/lib/rpm/noarch* +%attr(-, rpm, rpm) %{__prefix}/lib/rpm/noarch* -%rpmattr %{__prefix}/lib/rpm/rpmdb_* -%rpmattr %{__prefix}/lib/rpm/rpmfile +%rpmattr %{__prefix}/lib/rpm/rpmdb_* +%rpmattr %{__prefix}/lib/rpm/rpmfile -%lang(cs) %{__prefix}/*/locale/cs/LC_MESSAGES/rpm.mo -%lang(da) %{__prefix}/*/locale/da/LC_MESSAGES/rpm.mo -%lang(de) %{__prefix}/*/locale/de/LC_MESSAGES/rpm.mo -%lang(fi) %{__prefix}/*/locale/fi/LC_MESSAGES/rpm.mo -%lang(fr) %{__prefix}/*/locale/fr/LC_MESSAGES/rpm.mo -%lang(gl) %{__prefix}/*/locale/gl/LC_MESSAGES/rpm.mo -%lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/rpm.mo -%lang(ja) %{__prefix}/*/locale/ja/LC_MESSAGES/rpm.mo -%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/rpm.mo -%lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/rpm.mo -%lang(pl) %{__prefix}/*/locale/pl/LC_MESSAGES/rpm.mo -%lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/rpm.mo -%lang(pt_BR) %{__prefix}/*/locale/pt_BR/LC_MESSAGES/rpm.mo -%lang(ro) %{__prefix}/*/locale/ro/LC_MESSAGES/rpm.mo -%lang(ru) %{__prefix}/*/locale/ru/LC_MESSAGES/rpm.mo -%lang(sk) %{__prefix}/*/locale/sk/LC_MESSAGES/rpm.mo -%lang(sl) %{__prefix}/*/locale/sl/LC_MESSAGES/rpm.mo -%lang(sr) %{__prefix}/*/locale/sr/LC_MESSAGES/rpm.mo -%lang(sv) %{__prefix}/*/locale/sv/LC_MESSAGES/rpm.mo -%lang(tr) %{__prefix}/*/locale/tr/LC_MESSAGES/rpm.mo +%lang(cs) %{__prefix}/*/locale/cs/LC_MESSAGES/rpm.mo +%lang(da) %{__prefix}/*/locale/da/LC_MESSAGES/rpm.mo +%lang(de) %{__prefix}/*/locale/de/LC_MESSAGES/rpm.mo +%lang(fi) %{__prefix}/*/locale/fi/LC_MESSAGES/rpm.mo +%lang(fr) %{__prefix}/*/locale/fr/LC_MESSAGES/rpm.mo +%lang(gl) %{__prefix}/*/locale/gl/LC_MESSAGES/rpm.mo +%lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/rpm.mo +%lang(ja) %{__prefix}/*/locale/ja/LC_MESSAGES/rpm.mo +%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/rpm.mo +%lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/rpm.mo +%lang(pl) %{__prefix}/*/locale/pl/LC_MESSAGES/rpm.mo +%lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/rpm.mo +%lang(pt_BR) %{__prefix}/*/locale/pt_BR/LC_MESSAGES/rpm.mo +%lang(ro) %{__prefix}/*/locale/ro/LC_MESSAGES/rpm.mo +%lang(ru) %{__prefix}/*/locale/ru/LC_MESSAGES/rpm.mo +%lang(sk) %{__prefix}/*/locale/sk/LC_MESSAGES/rpm.mo +%lang(sl) %{__prefix}/*/locale/sl/LC_MESSAGES/rpm.mo +%lang(sr) %{__prefix}/*/locale/sr/LC_MESSAGES/rpm.mo +%lang(sv) %{__prefix}/*/locale/sv/LC_MESSAGES/rpm.mo +%lang(tr) %{__prefix}/*/locale/tr/LC_MESSAGES/rpm.mo %{__mandir}/man1/gendiff.1* %{__mandir}/man8/rpm.8* %{__mandir}/man8/rpm2cpio.8* -%lang(ja) %{__mandir}/ja/man[18]/*.[18]* -%lang(pl) %{__mandir}/pl/man[18]/*.[18]* -%lang(ru) %{__mandir}/ru/man[18]/*.[18]* -%lang(sk) %{__mandir}/sk/man[18]/*.[18]* +%lang(ja) %{__mandir}/ja/man[18]/*.[18]* +%lang(pl) %{__mandir}/pl/man[18]/*.[18]* +%lang(ru) %{__mandir}/ru/man[18]/*.[18]* +%lang(sk) %{__mandir}/sk/man[18]/*.[18]* %files libs %defattr(-,root,root) @@ -501,44 +463,44 @@ %dir %{__prefix}/src/redhat/SRPMS %dir %{__prefix}/src/redhat/RPMS %{__prefix}/src/redhat/RPMS/* -%rpmattr %{__bindir}/rpmbuild -%rpmattr %{__prefix}/lib/rpm/brp-* -%rpmattr %{__prefix}/lib/rpm/check-files -%rpmattr %{__prefix}/lib/rpm/check-prereqs -%rpmattr %{__prefix}/lib/rpm/config.site -%rpmattr %{__prefix}/lib/rpm/cross-build -%rpmattr %{__prefix}/lib/rpm/debugedit -%rpmattr %{__prefix}/lib/rpm/find-debuginfo.sh -%rpmattr %{__prefix}/lib/rpm/find-lang.sh -%rpmattr %{__prefix}/lib/rpm/find-prov.pl -%rpmattr %{__prefix}/lib/rpm/find-provides -%rpmattr %{__prefix}/lib/rpm/find-provides.perl -%rpmattr %{__prefix}/lib/rpm/find-req.pl -%rpmattr %{__prefix}/lib/rpm/find-requires -%rpmattr %{__prefix}/lib/rpm/find-requires.perl -%rpmattr %{__prefix}/lib/rpm/get_magic.pl -%rpmattr %{__prefix}/lib/rpm/getpo.sh -%rpmattr %{__prefix}/lib/rpm/http.req -%rpmattr %{__prefix}/lib/rpm/javadeps -%rpmattr %{__prefix}/lib/rpm/magic -%rpmattr %{__prefix}/lib/rpm/magic.mgc -%rpmattr %{__prefix}/lib/rpm/magic.mime -%rpmattr %{__prefix}/lib/rpm/magic.mime.mgc -%rpmattr %{__prefix}/lib/rpm/magic.prov -%rpmattr %{__prefix}/lib/rpm/magic.req -%rpmattr %{__prefix}/lib/rpm/mono-find-provides -%rpmattr %{__prefix}/lib/rpm/mono-find-requires -%rpmattr %{__prefix}/lib/rpm/perldeps.pl -%rpmattr %{__prefix}/lib/rpm/perl.prov -%rpmattr %{__prefix}/lib/rpm/perl.req -%rpmattr %{__prefix}/lib/rpm/pythondeps.sh - -%rpmattr %{__prefix}/lib/rpm/rpm[bt] -%rpmattr %{__prefix}/lib/rpm/rpmdeps -%rpmattr %{__prefix}/lib/rpm/trpm -%rpmattr %{__prefix}/lib/rpm/u_pkg.sh -%rpmattr %{__prefix}/lib/rpm/vpkg-provides.sh -%rpmattr %{__prefix}/lib/rpm/vpkg-provides2.sh +%rpmattr %{__bindir}/rpmbuild +%rpmattr %{__prefix}/lib/rpm/brp-* +%rpmattr %{__prefix}/lib/rpm/check-files +%rpmattr %{__prefix}/lib/rpm/check-prereqs +%rpmattr %{__prefix}/lib/rpm/config.site +%rpmattr %{__prefix}/lib/rpm/cross-build +%rpmattr %{__prefix}/lib/rpm/debugedit +%rpmattr %{__prefix}/lib/rpm/find-debuginfo.sh +%rpmattr %{__prefix}/lib/rpm/find-lang.sh +%rpmattr %{__prefix}/lib/rpm/find-prov.pl +%rpmattr %{__prefix}/lib/rpm/find-provides +%rpmattr %{__prefix}/lib/rpm/find-provides.perl +%rpmattr %{__prefix}/lib/rpm/find-req.pl +%rpmattr %{__prefix}/lib/rpm/find-requires +%rpmattr %{__prefix}/lib/rpm/find-requires.perl +%rpmattr %{__prefix}/lib/rpm/get_magic.pl +%rpmattr %{__prefix}/lib/rpm/getpo.sh +%rpmattr %{__prefix}/lib/rpm/http.req +%rpmattr %{__prefix}/lib/rpm/javadeps +%rpmattr %{__prefix}/lib/rpm/magic +%rpmattr %{__prefix}/lib/rpm/magic.mgc +%rpmattr %{__prefix}/lib/rpm/magic.mime +%rpmattr %{__prefix}/lib/rpm/magic.mime.mgc +%rpmattr %{__prefix}/lib/rpm/magic.prov +%rpmattr %{__prefix}/lib/rpm/magic.req +%rpmattr %{__prefix}/lib/rpm/mono-find-provides +%rpmattr %{__prefix}/lib/rpm/mono-find-requires +%rpmattr %{__prefix}/lib/rpm/perldeps.pl +%rpmattr %{__prefix}/lib/rpm/perl.prov +%rpmattr %{__prefix}/lib/rpm/perl.req +%rpmattr %{__prefix}/lib/rpm/pythondeps.sh + +%rpmattr %{__prefix}/lib/rpm/rpm[bt] +%rpmattr %{__prefix}/lib/rpm/rpmdeps +%rpmattr %{__prefix}/lib/rpm/trpm +%rpmattr %{__prefix}/lib/rpm/u_pkg.sh +%rpmattr %{__prefix}/lib/rpm/vpkg-provides.sh +%rpmattr %{__prefix}/lib/rpm/vpkg-provides2.sh %{__mandir}/man8/rpmbuild.8* %{__mandir}/man8/rpmdeps.8* @@ -565,43 +527,43 @@ %{__libdir}/librpmbuild.so %{__mandir}/man8/rpmcache.8* %{__mandir}/man8/rpmgraph.8* -%rpmattr %{__prefix}/lib/rpm/rpmcache -%rpmattr %{__bindir}/rpmgraph +%rpmattr %{__prefix}/lib/rpm/rpmcache +%rpmattr %{__bindir}/rpmgraph %files -n popt %defattr(-,root,root) %{__libdir}/libpopt.so.* %{__mandir}/man3/popt.3* -%lang(cs) %{__prefix}/*/locale/cs/LC_MESSAGES/popt.mo -%lang(da) %{__prefix}/*/locale/da/LC_MESSAGES/popt.mo -%lang(de) %{__prefix}/*/locale/de/LC_MESSAGES/popt.mo -%lang(es) %{__prefix}/*/locale/es/LC_MESSAGES/popt.mo -%lang(eu_ES) %{__prefix}/*/locale/eu_ES/LC_MESSAGES/popt.mo -%lang(fi) %{__prefix}/*/locale/fi/LC_MESSAGES/popt.mo -%lang(fr) %{__prefix}/*/locale/fr/LC_MESSAGES/popt.mo -%lang(gl) %{__prefix}/*/locale/gl/LC_MESSAGES/popt.mo -%lang(hu) %{__prefix}/*/locale/hu/LC_MESSAGES/popt.mo -%lang(id) %{__prefix}/*/locale/id/LC_MESSAGES/popt.mo -%lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/popt.mo -%lang(it) %{__prefix}/*/locale/it/LC_MESSAGES/popt.mo -%lang(ja) %{__prefix}/*/locale/ja/LC_MESSAGES/popt.mo -%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/popt.mo -%lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/popt.mo -%lang(pl) %{__prefix}/*/locale/pl/LC_MESSAGES/popt.mo -%lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/popt.mo -%lang(pt_BR) %{__prefix}/*/locale/pt_BR/LC_MESSAGES/popt.mo -%lang(ro) %{__prefix}/*/locale/ro/LC_MESSAGES/popt.mo -%lang(ru) %{__prefix}/*/locale/ru/LC_MESSAGES/popt.mo -%lang(sk) %{__prefix}/*/locale/sk/LC_MESSAGES/popt.mo -%lang(sl) %{__prefix}/*/locale/sl/LC_MESSAGES/popt.mo -%lang(sr) %{__prefix}/*/locale/sr/LC_MESSAGES/popt.mo -%lang(sv) %{__prefix}/*/locale/sv/LC_MESSAGES/popt.mo -%lang(tr) %{__prefix}/*/locale/tr/LC_MESSAGES/popt.mo -%lang(uk) %{__prefix}/*/locale/uk/LC_MESSAGES/popt.mo -%lang(wa) %{__prefix}/*/locale/wa/LC_MESSAGES/popt.mo -%lang(zh) %{__prefix}/*/locale/zh/LC_MESSAGES/popt.mo -%lang(zh_CN) %{__prefix}/*/locale/zh_CN/LC_MESSAGES/popt.mo -%lang(zh_TW) %{__prefix}/*/locale/zh_TW/LC_MESSAGES/popt.mo +%lang(cs) %{__prefix}/*/locale/cs/LC_MESSAGES/popt.mo +%lang(da) %{__prefix}/*/locale/da/LC_MESSAGES/popt.mo +%lang(de) %{__prefix}/*/locale/de/LC_MESSAGES/popt.mo +%lang(es) %{__prefix}/*/locale/es/LC_MESSAGES/popt.mo +%lang(eu_ES) %{__prefix}/*/locale/eu_ES/LC_MESSAGES/popt.mo +%lang(fi) %{__prefix}/*/locale/fi/LC_MESSAGES/popt.mo +%lang(fr) %{__prefix}/*/locale/fr/LC_MESSAGES/popt.mo +%lang(gl) %{__prefix}/*/locale/gl/LC_MESSAGES/popt.mo +%lang(hu) %{__prefix}/*/locale/hu/LC_MESSAGES/popt.mo +%lang(id) %{__prefix}/*/locale/id/LC_MESSAGES/popt.mo +%lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/popt.mo +%lang(it) %{__prefix}/*/locale/it/LC_MESSAGES/popt.mo +%lang(ja) %{__prefix}/*/locale/ja/LC_MESSAGES/popt.mo +%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/popt.mo +%lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/popt.mo +%lang(pl) %{__prefix}/*/locale/pl/LC_MESSAGES/popt.mo +%lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/popt.mo +%lang(pt_BR) %{__prefix}/*/locale/pt_BR/LC_MESSAGES/popt.mo +%lang(ro) %{__prefix}/*/locale/ro/LC_MESSAGES/popt.mo +%lang(ru) %{__prefix}/*/locale/ru/LC_MESSAGES/popt.mo +%lang(sk) %{__prefix}/*/locale/sk/LC_MESSAGES/popt.mo +%lang(sl) %{__prefix}/*/locale/sl/LC_MESSAGES/popt.mo +%lang(sr) %{__prefix}/*/locale/sr/LC_MESSAGES/popt.mo +%lang(sv) %{__prefix}/*/locale/sv/LC_MESSAGES/popt.mo +%lang(tr) %{__prefix}/*/locale/tr/LC_MESSAGES/popt.mo +%lang(uk) %{__prefix}/*/locale/uk/LC_MESSAGES/popt.mo +%lang(wa) %{__prefix}/*/locale/wa/LC_MESSAGES/popt.mo +%lang(zh) %{__prefix}/*/locale/zh/LC_MESSAGES/popt.mo +%lang(zh_CN) %{__prefix}/*/locale/zh_CN/LC_MESSAGES/popt.mo +%lang(zh_TW) %{__prefix}/*/locale/zh_TW/LC_MESSAGES/popt.mo # XXX These may end up in popt-devel but it hardly seems worth the effort. %{__libdir}/libpopt.a @@ -722,7 +684,7 @@ * Mon Nov 28 2005 Paul Nasrat - 4.4.2-8 - Add elfutils Build Requires to rpmbuild (#155129) -- Don't do conflicts if both files %ghost(#155256) +- Don't do conflicts if both files %%ghost(#155256) - Fix popt charset for various languages (#172155) - Don't include .la file (#174261) From fedora-cvs-commits at redhat.com Fri Mar 2 13:44:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 08:44:44 -0500 Subject: rpms/xen/devel xen-boot-raw-tap.patch, NONE, 1.1 xen.spec, 1.167, 1.168 Message-ID: <200703021344.l22DiiPY024194@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24178 Modified Files: xen.spec Added Files: xen-boot-raw-tap.patch Log Message: Added fix for blktap+bootloader (bz 230702) xen-boot-raw-tap.patch: util/blkif.py | 17 ++++++++++++----- xend/XendDomainInfo.py | 5 +++-- 2 files changed, 15 insertions(+), 7 deletions(-) --- NEW FILE xen-boot-raw-tap.patch --- --- xen-3.0.4_1-src/tools/python/xen/util/blkif.py.boot-raw-tap 2007-03-02 11:17:44.000000000 +0000 +++ xen-3.0.4_1-src/tools/python/xen/util/blkif.py 2007-03-02 11:20:34.000000000 +0000 @@ -66,16 +66,23 @@ 'type' : 'Disk' } return val -def blkdev_uname_to_file(uname): - """Take a blkdev uname and return the corresponding filename.""" - fn = None +def _parse_uname(uname): + fn = taptype = None if uname.find(":") != -1: (typ, fn) = uname.split(":", 1) if typ == "phy" and not fn.startswith("/"): fn = "/dev/%s" %(fn,) if typ == "tap": - (typ, fn) = fn.split(":", 1) - return fn + (taptype, fn) = fn.split(":", 1) + return (fn, taptype) + +def blkdev_uname_to_file(uname): + """Take a blkdev uname and return the corresponding filename.""" + return _parse_uname(uname)[0] + +def blkdev_uname_to_taptype(uname): + """Take a blkdev uname and return the blktap type.""" + return _parse_uname(uname)[1] def mount_mode(name): mode = None --- xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py.boot-raw-tap 2007-03-02 11:21:18.000000000 +0000 +++ xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py 2007-03-02 11:24:03.000000000 +0000 @@ -34,7 +34,7 @@ import xen.lowlevel.xc from xen.util import asserts -from xen.util.blkif import blkdev_uname_to_file +from xen.util.blkif import blkdev_uname_to_file, blkdev_uname_to_taptype from xen.util import security from xen.xend import balloon, sxp, uuid, image, arch @@ -1562,7 +1562,8 @@ if disk is None: continue fn = blkdev_uname_to_file(disk) - mounted = devtype == 'tap' and not os.stat(fn).st_rdev + taptype = blkdev_uname_to_taptype(disk) + mounted = devtype == 'tap' and taptype != 'aio' and taptype != 'sync' and not os.stat(fn).st_rdev if mounted: # This is a file, not a device. pygrub can cope with a # file if it's raw, but if it's QCOW or other such formats Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- xen.spec 8 Feb 2007 18:30:40 -0000 1.167 +++ xen.spec 2 Mar 2007 13:44:42 -0000 1.168 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.4 -Release: 6%{dist} +Release: 7%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -20,6 +20,7 @@ Patch18: xen-block-readonly.patch Patch20: xen-blktap-no-aio-epoll.patch Patch21: xen-blktap-error-returns.patch +Patch22: xen-boot-raw-tap.patch # Patches to modify the default config of xend Patch100: xen-config-dom0-minmem.patch @@ -105,6 +106,7 @@ # blktap patches %patch20 -p1 %patch21 -p1 +%patch22 -p1 # config patches %patch100 -p1 @@ -235,7 +237,10 @@ %{_libdir}/*.a %changelog -* Thu Feb 8 2007 Daniel Berrange - 3.0.4-6.fc7 +* Fri Mar 2 2007 Daniel Berrange - 3.0.4-7.fc7 +- Fix interaction of bootloader with blktap (bz 230702) + +* Thu Feb 8 2007 Daniel Berrange - 3.0.4-6.fc7 - Setup readonly loop devices for readonly disks - Extended error reporting for hotplug scripts - Pass all 8 mouse buttons from VNC through to kernel From fedora-cvs-commits at redhat.com Fri Mar 2 13:56:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 08:56:06 -0500 Subject: rpms/kasumi/FC-6 .cvsignore, 1.7, 1.8 kasumi.spec, 1.19, 1.20 sources, 1.6, 1.7 kasumi-1.0-gcc41.patch, 1.1, NONE kasumi-2.0.1-errorcode.patch, 1.1, NONE kasumi.desktop, 1.2, NONE Message-ID: <200703021356.l22Du6np017459@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/kasumi/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17443 Modified Files: .cvsignore kasumi.spec sources Removed Files: kasumi-1.0-gcc41.patch kasumi-2.0.1-errorcode.patch kasumi.desktop Log Message: * Fri Mar 2 2007 Akira TAGOH - 2.2-1 - Updated to 2.2 - Remove kasumi-2.0.1-errorcode.patch. no longer needed. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kasumi/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jun 2006 03:59:46 -0000 1.7 +++ .cvsignore 2 Mar 2007 13:56:04 -0000 1.8 @@ -7,3 +7,4 @@ kasumi-1.0.tar.gz kasumi-2.0.tar.gz kasumi-2.0.1.tar.gz +kasumi-2.2.tar.gz Index: kasumi.spec =================================================================== RCS file: /cvs/dist/rpms/kasumi/FC-6/kasumi.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- kasumi.spec 12 Jul 2006 06:36:28 -0000 1.19 +++ kasumi.spec 2 Mar 2007 13:56:04 -0000 1.20 @@ -1,15 +1,13 @@ Name: kasumi -Version: 2.0.1 -Release: 1.1%{?dist} +Version: 2.2 +Release: 1%{?dist} License: GPL URL: http://kasumi.sourceforge.jp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf Source0: %{name}-%{version}.tar.gz -Source1: %{name}.desktop -Patch0: kasumi-1.0-gcc41.patch -Patch1: kasumi-2.0.1-errorcode.patch +#Patch0: kasumi-1.0-gcc41.patch Summary: An anthy dictionary management tool. @@ -20,11 +18,10 @@ %prep %setup -q -%patch0 -p1 -b .gcc41 -%patch1 -p1 -b .errcode -aclocal -automake --add-missing -autoconf +#%%patch0 -p1 -b .gcc41 +#aclocal +#automake --add-missing +#autoconf %build %configure @@ -39,7 +36,8 @@ --vendor fedora \ --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE1} + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} @@ -52,13 +50,18 @@ %files -f %{name}.lang %defattr(-,root,root, -) %{_bindir}/kasumi -%{_datadir}/kasumi +%{_mandir}/man1/kasumi.1* +%{_datadir}/pixmaps/kasumi.png %{_datadir}/applications/fedora-kasumi.desktop %doc AUTHORS COPYING ChangeLog NEWS README %changelog -* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +* Fri Mar 2 2007 Akira TAGOH - 2.2-1 +- Updated to 2.2 +- Remove kasumi-2.0.1-errorcode.patch. no longer needed. + +* Wed Jul 12 2006 Jesse Keating - 2.0.1-1.1 - rebuild * Fri Jun 30 2006 Akira TAGOH - 2.0.1-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kasumi/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jun 2006 03:59:46 -0000 1.6 +++ sources 2 Mar 2007 13:56:04 -0000 1.7 @@ -1 +1 @@ -03c03a261c63d2c8cd4bdcc77a55d7eb kasumi-2.0.1.tar.gz +d0c3a605fc95b89d4e102ffdd0b4c37d kasumi-2.2.tar.gz --- kasumi-1.0-gcc41.patch DELETED --- --- kasumi-2.0.1-errorcode.patch DELETED --- --- kasumi.desktop DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 14:14:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 09:14:00 -0500 Subject: rpms/cups/devel cups-lspp.patch,1.19,1.20 cups.spec,1.314,1.315 Message-ID: <200703021414.l22EE0vG017880@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17862 Modified Files: cups-lspp.patch cups.spec Log Message: * Fri Mar 2 2007 Tim Waugh 1:1.2.8-3 - Updated LSPP patch (bug #229673). - Resolves: rhbz#229673 cups-lspp.patch: Makedefs.in | 4 config-scripts/cups-lspp.m4 | 36 +++ config.h.in | 7 configure.in | 2 cups/cups.h | 9 data/Makefile | 5 data/mls | 277 ++++++++++++++++++++++++++ data/selinux | 277 ++++++++++++++++++++++++++ data/te | 277 ++++++++++++++++++++++++++ scheduler/client.c | 170 ++++++++++++++++ scheduler/client.h | 14 + scheduler/conf.c | 46 ++++ scheduler/conf.h | 7 scheduler/ipp.c | 457 ++++++++++++++++++++++++++++++++++++++++++++ scheduler/job.c | 275 ++++++++++++++++++++++++++ scheduler/job.h | 11 + scheduler/main.c | 32 +++ scheduler/printers.c | 51 ++++ 18 files changed, 1953 insertions(+), 4 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.19 -r 1.20 cups-lspp.patch Index: cups-lspp.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-lspp.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cups-lspp.patch 27 Nov 2006 15:03:26 -0000 1.19 +++ cups-lspp.patch 2 Mar 2007 14:13:58 -0000 1.20 @@ -1,5 +1,25 @@ ---- /dev/null 2006-11-22 09:23:57.810898750 +0000 -+++ cups-1.2.7/config-scripts/cups-lspp.m4 2006-11-22 11:40:42.000000000 +0000 +--- cups-1.2.8/Makedefs.in.lspp 2007-03-02 14:06:43.000000000 +0000 ++++ cups-1.2.8/Makedefs.in 2007-03-02 14:06:46.000000000 +0000 +@@ -136,7 +136,7 @@ + @LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM) + LINKCUPS = @LINKCUPS@ $(SSLLIBS) + LINKCUPSIMAGE = @LINKCUPSIMAGE@ +-LIBS = $(LINKCUPS) $(COMMONLIBS) ++LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ + OPTIM = @OPTIM@ + OPTIONS = + PAMLIBS = @PAMLIBS@ +@@ -239,7 +239,7 @@ + # Rules... + # + +-.SILENT: ++ + .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz + + .c.o: +--- /dev/null 2007-03-02 08:56:41.811642143 +0000 ++++ cups-1.2.8/config-scripts/cups-lspp.m4 2007-03-02 14:06:43.000000000 +0000 @@ -0,0 +1,36 @@ +dnl +dnl LSPP code for the Common UNIX Printing System (CUPS). @@ -37,39 +57,8 @@ + ;; + esac +fi ---- cups-1.2.7/configure.in.lspp 2006-08-04 17:51:58.000000000 +0100 -+++ cups-1.2.7/configure.in 2006-11-22 11:40:42.000000000 +0000 -@@ -47,6 +47,8 @@ - sinclude(config-scripts/cups-pdf.m4) - sinclude(config-scripts/cups-scripting.m4) - -+sinclude(config-scripts/cups-lspp.m4) -+ - INSTALL_LANGUAGES="" - UNINSTALL_LANGUAGES="" - LANGFILES="" ---- cups-1.2.7/Makedefs.in.lspp 2006-11-22 11:40:42.000000000 +0000 -+++ cups-1.2.7/Makedefs.in 2006-11-22 11:40:44.000000000 +0000 -@@ -136,7 +136,7 @@ - @LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM) - LINKCUPS = @LINKCUPS@ $(SSLLIBS) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ --LIBS = $(LINKCUPS) $(COMMONLIBS) -+LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ - OPTIM = @OPTIM@ - OPTIONS = - PAMLIBS = @PAMLIBS@ -@@ -239,7 +239,7 @@ - # Rules... - # - --.SILENT: -+ - .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz - - .c.o: ---- /dev/null 2006-11-22 09:23:57.810898750 +0000 -+++ cups-1.2.7/data/mls 2006-11-22 11:40:42.000000000 +0000 +--- /dev/null 2007-03-02 08:56:41.811642143 +0000 ++++ cups-1.2.8/data/mls 2007-03-02 14:06:43.000000000 +0000 @@ -0,0 +1,277 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -348,8 +337,8 @@ +% End of "$Id$". +% +%%EOF ---- /dev/null 2006-11-22 09:23:57.810898750 +0000 -+++ cups-1.2.7/data/selinux 2006-11-22 11:40:42.000000000 +0000 +--- /dev/null 2007-03-02 08:56:41.811642143 +0000 ++++ cups-1.2.8/data/selinux 2007-03-02 14:06:43.000000000 +0000 @@ -0,0 +1,277 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -628,8 +617,22 @@ +% End of "$Id$". +% +%%EOF ---- /dev/null 2006-11-22 09:23:57.810898750 +0000 -+++ cups-1.2.7/data/te 2006-11-22 11:40:42.000000000 +0000 +--- cups-1.2.8/data/Makefile.lspp 2006-03-19 03:23:34.000000000 +0000 ++++ cups-1.2.8/data/Makefile 2007-03-02 14:06:43.000000000 +0000 +@@ -34,7 +34,10 @@ + secret \ + standard \ + topsecret \ +- unclassified ++ unclassified \ ++ selinux \ ++ mls \ ++ te + + CHARMAPS = \ + euc-cn.txt \ +--- /dev/null 2007-03-02 08:56:41.811642143 +0000 ++++ cups-1.2.8/data/te 2007-03-02 14:06:43.000000000 +0000 @@ -0,0 +1,277 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -908,23 +911,9 @@ +% End of "$Id$". +% +%%EOF ---- cups-1.2.7/data/Makefile.lspp 2006-03-19 03:23:34.000000000 +0000 -+++ cups-1.2.7/data/Makefile 2006-11-22 11:40:42.000000000 +0000 -@@ -34,7 +34,10 @@ - secret \ - standard \ - topsecret \ -- unclassified -+ unclassified \ -+ selinux \ -+ mls \ -+ te - - CHARMAPS = \ - euc-cn.txt \ ---- cups-1.2.7/config.h.in.lspp 2006-11-02 20:01:54.000000000 +0000 -+++ cups-1.2.7/config.h.in 2006-11-22 11:40:42.000000000 +0000 -@@ -458,6 +458,13 @@ +--- cups-1.2.8/config.h.in.lspp 2007-02-06 16:04:25.000000000 +0000 ++++ cups-1.2.8/config.h.in 2007-03-02 14:06:43.000000000 +0000 +@@ -468,6 +468,13 @@ #undef HAVE_APPLETALK_AT_PROTO_H @@ -938,460 +927,402 @@ #endif /* !_CUPS_CONFIG_H_ */ /* ---- cups-1.2.7/scheduler/printers.c 2006-11-22 11:40:42.000000000 +0000 -+++ cups-1.2.7/scheduler/printers.c 2006-11-22 11:23:38.000000000 +0000 -@@ -57,6 +57,8 @@ - * printing desktop tools. +--- cups-1.2.8/configure.in.lspp 2006-12-06 20:10:16.000000000 +0000 ++++ cups-1.2.8/configure.in 2007-03-02 14:06:43.000000000 +0000 +@@ -48,6 +48,8 @@ + sinclude(config-scripts/cups-pdf.m4) + sinclude(config-scripts/cups-scripting.m4) + ++sinclude(config-scripts/cups-lspp.m4) ++ + INSTALL_LANGUAGES="" + UNINSTALL_LANGUAGES="" + LANGFILES="" +--- cups-1.2.8/cups/cups.h.lspp 2007-01-10 16:23:06.000000000 +0000 ++++ cups-1.2.8/cups/cups.h 2007-03-02 14:06:43.000000000 +0000 +@@ -24,6 +24,9 @@ + * This file is subject to the Apple OS-Developed Software exception. */ ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + + #ifndef _CUPS_CUPS_H_ + # define _CUPS_CUPS_H_ + +@@ -75,6 +78,12 @@ + # define CUPS_DATE_ANY -1 + + ++# ifdef WITH_LSPP ++# define MLS_CONFIG "mls" ++# define TE_CONFIG "te" ++# define SELINUX_CONFIG "SELinux" ++# define UNKNOWN_SL "UNKNOWN SL" ++# endif /* WITH_LSPP */ /* - * Include necessary headers... + * Types and structures... + */ +--- cups-1.2.8/scheduler/client.h.lspp 2007-01-22 22:04:43.000000000 +0000 ++++ cups-1.2.8/scheduler/client.h 2007-03-02 14:06:43.000000000 +0000 +@@ -22,6 +22,13 @@ + * WWW: http://www.cups.org */ -@@ -79,6 +81,10 @@ - static void write_irix_state(cupsd_printer_t *p); - #endif /* __sgi */ ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ +#ifdef WITH_LSPP -+# include [...1790 lines suppressed...] -+ { -+ if (getfilecon(con->filename, &spoolcon) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ return (cupsdCloseClient(con)); -+ } -+ clicon = context_new(con->scon); -+ tmpcon = context_new(spoolcon); -+ freecon(spoolcon); -+ if (!clicon || !tmpcon) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ if (clicon) -+ context_free(clicon); -+ if (tmpcon) -+ context_free(tmpcon); -+ return (cupsdCloseClient(con)); -+ } -+ clirange = strdup(context_range_get(clicon)); -+ if ((cliclearance = strtok(clirange, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, cliclearance) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(clicon))) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ free(clirange); -+ if (setfilecon(con->filename, context_str(tmpcon)) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %s set to %s", -+ con->filename, context_str(tmpcon)); -+ context_free(tmpcon); -+ context_free(clicon); -+ } ++ char *audit_message; /* Audit message string */ ++ char *printerfile; /* Path to a local printer dev */ ++ char *rangestr; /* Printer's range if its available */ ++ security_context_t devcon; /* Printer SELinux context */ ++ context_t printercon; /* context_t for the printer */ +#endif /* WITH_LSPP */ - } - - if (con->http.state != HTTP_POST_SEND) -@@ -3823,6 +3949,50 @@ - #endif /* HAVE_SSL */ + DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, +@@ -1579,6 +1592,44 @@ + attr->values[1].string.text = _cupsStrAlloc(Classification ? + Classification : p->job_sheets[1]); + } +#ifdef WITH_LSPP -+/* -+ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid. -+ */ -+ -+uid_t client_pid_to_auid(pid_t clipid) -+{ -+ uid_t uid; -+ int len, in; -+ char buf[16] = {0}; -+ char fname[32] = {0}; -+ -+ -+ /* -+ * Hopefully this pid is still the one we are interested in. -+ */ -+ snprintf(fname, 32, "/proc/%d/loginuid", clipid); -+ in = open(fname, O_NOFOLLOW|O_RDONLY); -+ -+ if (in < 0) -+ return -1; -+ -+ errno = 0; -+ -+ do { -+ len = read(in, buf, sizeof(buf)); -+ } while (len < 0 && errno == EINTR); -+ -+ close(in); ++ if (AuditLog != -1) ++ { ++ char uri[HTTP_MAX_URI]; ++ audit_message = NULL; ++ rangestr = NULL; ++ printercon = 0; ++ printerfile = strstr(p->device_uri, "/dev/"); ++ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0)) ++ printerfile = strdup(p->device_uri + strlen("file:/")); + -+ if (len < 0 || len >= sizeof(buf)) -+ return -1; ++ if (printerfile != NULL) ++ { ++ if (getfilecon(printerfile, &devcon) == -1) ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context"); ++ else ++ { ++ printercon = context_new(devcon); ++ freecon(devcon); ++ } ++ } + -+ errno = 0; -+ buf[len] = 0; -+ uid = strtol(buf, 0, 10); ++ if (printercon && context_range_get(printercon)) ++ rangestr = strdup(context_range_get(printercon)); ++ else ++ rangestr = strdup("unknown"); + -+ if (errno != 0) -+ return -1; -+ else -+ return uid; -+} ++ cupsdSanitizeURI(p->device_uri, uri, sizeof(uri)); ++ cupsdSetStringf(&audit_message, "printer=%s uri=%s banners=%s,%s range=%s", ++ p->name, uri, p->job_sheets[0], p->job_sheets[1], rangestr); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, ++ ServerName, NULL, NULL, 1); ++ if (printercon) ++ context_free(printercon); ++ free(rangestr); ++ free(audit_message); ++ } +#endif /* WITH_LSPP */ -+ - /* - * 'pipe_command()' - Pipe the output of a command to the remote client. - */ ---- cups-1.2.7/cups/cups.h.lspp 2006-11-14 16:36:36.000000000 +0000 -+++ cups-1.2.7/cups/cups.h 2006-11-22 11:40:42.000000000 +0000 -@@ -24,6 +24,9 @@ - * This file is subject to the Apple OS-Developed Software exception. + } + + printer_type = p->type; +--- cups-1.2.8/scheduler/job.h.lspp 2006-09-19 21:11:08.000000000 +0100 ++++ cups-1.2.8/scheduler/job.h 2007-03-02 14:06:43.000000000 +0000 +@@ -22,6 +22,13 @@ + * WWW: http://www.cups.org */ +/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + - #ifndef _CUPS_CUPS_H_ - # define _CUPS_CUPS_H_ - -@@ -68,6 +71,12 @@ - # define CUPS_DATE_ANY -1 - - -+# ifdef WITH_LSPP -+# define MLS_CONFIG "mls" -+# define TE_CONFIG "te" -+# define SELINUX_CONFIG "SELinux" -+# define UNKNOWN_SL "UNKNOWN SL" -+# endif /* WITH_LSPP */ ++#ifdef WITH_LSPP ++#include ++#endif /* WITH_LSPP */ ++ /* - * Types and structures... + * Job request structure... */ +@@ -55,6 +62,10 @@ + int status; /* Status code from filters */ + cupsd_printer_t *printer; /* Printer this job is assigned to */ + int tries; /* Number of tries for this job */ ++#ifdef WITH_LSPP ++ security_context_t scon; /* Security context of job */ ++ uid_t auid; /* Audit loginuid for this job */ ++#endif /* WITH_LSPP */ + } cupsd_job_t; + + Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- cups.spec 26 Feb 2007 18:45:57 -0000 1.314 +++ cups.spec 2 Mar 2007 14:13:58 -0000 1.315 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -435,6 +435,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Fri Mar 2 2007 Tim Waugh 1:1.2.8-3 +- Updated LSPP patch (bug #229673). + * Mon Feb 26 2007 Tim Waugh 1:1.2.8-2 - Applied fix for STR #2264 (bug #230116). From fedora-cvs-commits at redhat.com Fri Mar 2 14:14:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 09:14:45 -0500 Subject: rpms/thunderbird/devel firefox-1.5.0.10-nss-system-nspr.patch, NONE, 1.1 firefox-1.5.0.10-with-system-nss.patch, NONE, 1.1 firefox-1.5-pango-printing.patch, 1.3, 1.4 thunderbird.spec, 1.93, 1.94 firefox-1.1-nss-system-nspr.patch, 1.1, NONE firefox-1.5-with-system-nss.patch, 1.1, NONE Message-ID: <200703021414.l22EEjIX017962@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17942 Modified Files: firefox-1.5-pango-printing.patch thunderbird.spec Added Files: firefox-1.5.0.10-nss-system-nspr.patch firefox-1.5.0.10-with-system-nss.patch Removed Files: firefox-1.1-nss-system-nspr.patch firefox-1.5-with-system-nss.patch Log Message: Update to 1.5.0.10 firefox-1.5.0.10-nss-system-nspr.patch: coreconf/location.mk | 2 ++ manager/Makefile.in | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) --- NEW FILE firefox-1.5.0.10-nss-system-nspr.patch --- --- mozilla/security/coreconf/location.mk.old 2007-02-13 21:41:48.000000000 +0100 +++ mozilla/security/coreconf/location.mk 2007-02-15 16:52:03.000000000 +0100 @@ -61,6 +61,8 @@ DIST = $(SOURCE_PREFIX)/$(PLATFORM) +NSPR_LIBDIR = $(DIST)/lib + ifdef BUILD_DEBUG_GC DEFINES += -DDEBUG_GC endif --- mozilla/security/manager/Makefile.in.old 2007-02-13 21:43:11.000000000 +0100 +++ mozilla/security/manager/Makefile.in 2007-02-16 13:58:31.000000000 +0100 @@ -115,12 +115,23 @@ FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk endif +ABS_DIST := $(shell cd $(DIST) && pwd) +ifeq ($(OS_ARCH),WINNT) +ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') +endif +NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS))) +ifneq (,$(strip $(NSPR_LIBDIR))) +NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR))) +else +NSPR_LIBDIR = $(ABS_DIST)/lib +endif # NSS makefiles are not safe for parallel execution. DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 DEFAULT_GMAKE_FLAGS += CC="$(CC)" -DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" -DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist -DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist +DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)" +DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR) DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) firefox-1.5.0.10-with-system-nss.patch: aclocal.m4 | 1 build/autoconf/nss.m4 | 67 ++++++++++++++ config/autoconf.mk.in | 43 +++++++++ config/config.mk | 33 ------- configure | 129 ++++++++++++++++++++++++++++ configure.in | 18 +++ security/manager/Makefile.in | 16 +++ security/manager/ssl/src/Makefile.in | 5 + security/manager/ssl/src/nsNSSComponent.cpp | 52 ++++------- 9 files changed, 301 insertions(+), 63 deletions(-) --- NEW FILE firefox-1.5.0.10-with-system-nss.patch --- --- mozilla/configure.in.ccc 2006-08-31 17:37:23.000000000 +0200 +++ mozilla/configure.in 2007-02-22 14:42:15.000000000 +0100 @@ -86,6 +86,7 @@ MOZPNG=10207 MOZZLIB=1.2.3 NSPR_VERSION=4 +NSS_VERSION=3 dnl Set the minimum version of toolkit libs used by mozilla dnl ======================================================== @@ -3537,6 +3538,19 @@ fi fi +dnl ======================================================== +dnl = If NSS was not detected in the system, +dnl = use the one in the source tree (mozilla/security/nss) +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-nss, +[ --with-system-nss Use system installed NSS], + _USE_SYSTEM_NSS=1 ) + +if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=]) +fi + if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== @@ -6783,6 +6797,10 @@ AC_SUBST(NSPR_LIBS) AC_SUBST(MOZ_NATIVE_NSPR) +AC_SUBST(NSS_CFLAGS) +AC_SUBST(NSS_LIBS) +AC_SUBST(MOZ_NATIVE_NSS) + AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(CPPFLAGS) --- mozilla/config/autoconf.mk.in.ccc 2006-04-21 22:50:30.000000000 +0200 +++ mozilla/config/autoconf.mk.in 2007-02-22 14:42:14.000000000 +0100 @@ -231,6 +231,7 @@ MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@ MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@ +MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@ CROSS_COMPILE = @CROSS_COMPILE@ @@ -386,6 +387,48 @@ NSPR_CFLAGS = @NSPR_CFLAGS@ NSPR_LIBS = @NSPR_LIBS@ +NSS_CONFIG = @NSS_CONFIG@ +NSS_CFLAGS = @NSS_CFLAGS@ +NSS_LIBS = @NSS_LIBS@ + +ifdef MOZ_NATIVE_NSS +NSS_DEP_LIBS = \ + $(NULL) +NSS_LIBS += \ + -lcrmf \ + $(NULL) +else +NSS_DEP_LIBS = \ + $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ + $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ + $(NULL) +NSS_LIBS = \ + $(LIBS_DIR) \ + $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + -lsmime3 \ + -lssl3 \ + -lnss3 \ + -lsoftokn3 \ + $(NULL) +endif + +ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) +ifndef GNU_CC +ifndef MOZ_NATIVE_NSS +NSS_LIBS = \ + $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ + $(NULL) +endif +endif +endif + LDAP_CFLAGS = @LDAP_CFLAGS@ LDAP_LIBS = @LDAP_LIBS@ XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@ --- mozilla/config/config.mk.ccc 2006-04-06 18:28:13.000000000 +0200 +++ mozilla/config/config.mk 2007-02-22 14:42:14.000000000 +0100 @@ -138,39 +138,6 @@ FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names -# -# NSS libs needed for final link in static build -# - -NSS_LIBS = \ - $(LIBS_DIR) \ - $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ - -lnss3 \ - -lsoftokn3 \ - $(NULL) - -ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) -ifndef GNU_CC -NSS_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ - $(NULL) -endif -endif - -NSS_DEP_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ - $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ - $(NULL) - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) --- mozilla/aclocal.m4.ccc 2004-05-13 05:12:47.000000000 +0200 +++ mozilla/aclocal.m4 2007-02-22 14:42:14.000000000 +0100 @@ -8,6 +8,7 @@ builtin(include, build/autoconf/libIDL.m4)dnl builtin(include, build/autoconf/libIDL-2.m4)dnl builtin(include, build/autoconf/nspr.m4)dnl +builtin(include, build/autoconf/nss.m4)dnl builtin(include, build/autoconf/libart.m4)dnl builtin(include, build/autoconf/pkg.m4)dnl builtin(include, build/autoconf/freetype2.m4)dnl --- /dev/null 2007-02-21 10:09:45.647705500 +0100 +++ mozilla/build/autoconf/nss.m4 2007-02-22 14:42:15.000000000 +0100 @@ -0,0 +1,67 @@ +# -*- tab-width: 4; -*- +# Configure paths for NSS +# Public domain - Chris Seawood 2001-04-05 +# Based upon gtk.m4 (also PD) by Owen Taylor + +dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS +AC_DEFUN(AM_PATH_NSS, +[dnl + +AC_ARG_WITH(nss-prefix, + [ --with-nss-prefix=PFX Prefix where NSS is installed], + nss_config_prefix="$withval", + nss_config_prefix="") + +AC_ARG_WITH(nss-exec-prefix, + [ --with-nss-exec-prefix=PFX + Exec prefix where NSS is installed], + nss_config_exec_prefix="$withval", + nss_config_exec_prefix="") + + if test -n "$nss_config_exec_prefix"; then + nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config + fi + fi + if test -n "$nss_config_prefix"; then + nss_config_args="$nss_config_args --prefix=$nss_config_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_prefix/bin/nss-config + fi + fi + + unset ac_cv_path_NSS_CONFIG + AC_PATH_PROG(NSS_CONFIG, nss-config, no) + min_nss_version=ifelse([$1], ,3.0.0,$1) + AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping)) + + no_nss="" + if test "$NSS_CONFIG" = "no"; then + no_nss="yes" + else + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` + + dnl Skip version check for now + nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + fi + + if test -z "$no_nss"; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + fi + + + AC_SUBST(NSS_CFLAGS) + AC_SUBST(NSS_LIBS) + +]) --- mozilla/configure.ccc 2006-08-31 17:37:23.000000000 +0200 +++ mozilla/configure 2007-02-22 14:42:15.000000000 +0100 @@ -44,6 +44,13 @@ --with-nspr-exec-prefix=PFX Exec prefix where NSPR is installed" ac_help="$ac_help + --with-system-nss Use system installed NSS" +ac_help="$ac_help + --with-nss-prefix=PFX Prefix where NSS is installed" +ac_help="$ac_help + --with-nss-exec-prefix=PFX + Exec prefix where NSS is installed" +ac_help="$ac_help --with-system-jpeg[=PFX] Use system libjpeg [installed at prefix PFX]" ac_help="$ac_help @@ -1023,6 +1030,7 @@ MOZPNG=10207 MOZZLIB=1.2.3 NSPR_VERSION=4 +NSS_VERSION=3 GLIB_VERSION=1.2.0 GTK_VERSION=1.2.0 @@ -11399,6 +11407,123 @@ fi fi + +# Check whether --with-system-nss or --without-system-nss was given. +if test "${with_system_nss+set}" = set; then + withval="$with_system_nss" + if test "$withval" = "yes"; then + _USE_SYSTEM_NSS=1 + elif test "$withval" = "no"; then + : + else + { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; } + fi +fi + + +if test -n "$_USE_SYSTEM_NSS"; then + +# Check whether --with-nss-prefix or --without-nss-prefix was given. +if test "${with_nss_prefix+set}" = set; then + withval="$with_nss_prefix" + nss_config_prefix="$withval" +else + nss_config_prefix="" +fi + + +# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given. +if test "${with_nss_exec_prefix+set}" = set; then + withval="$with_nss_exec_prefix" + nss_config_exec_prefix="$withval" +else + nss_config_exec_prefix="" +fi + + + if test -n "$nss_config_exec_prefix"; then + nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config + fi + fi + if test -n "$nss_config_prefix"; then + nss_config_args="$nss_config_args --prefix=$nss_config_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_prefix/bin/nss-config + fi + fi + + unset ac_cv_path_NSS_CONFIG + # Extract the first word of "nss-config", so it can be a program name with args. +set dummy nss-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:11363: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$NSS_CONFIG" in + /*) + ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no" + ;; +esac +fi +NSS_CONFIG="$ac_cv_path_NSS_CONFIG" +if test -n "$NSS_CONFIG"; then + echo "$ac_t""$NSS_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +echo "configure:11398: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then + no_nss="yes" + else + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` + + nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + fi + + if test -z "$no_nss"; then + echo "$ac_t""yes" 1>&6 + MOZ_NATIVE_NSS=1 + else + echo "$ac_t""no" 1>&6 + fi + + + + + + +fi + if test -z "$SKIP_LIBRARY_CHECKS"; then # Check whether --with-system-jpeg or --without-system-jpeg was given. if test "${with_system_jpeg+set}" = set; then @@ -19598,6 +19723,9 @@ s%@NSPR_CONFIG@%$NSPR_CONFIG%g s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g s%@NSPR_LIBS@%$NSPR_LIBS%g +s%@NSS_CONFIG@%$NSS_CONFIG%g +s%@NSS_CFLAGS@%$NSS_CFLAGS%g +s%@NSS_LIBS@%$NSS_LIBS%g s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g @@ -19879,6 +20007,7 @@ s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g +s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g s%@CROSS_COMPILE@%$CROSS_COMPILE%g --- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.ccc 2005-08-26 08:41:50.000000000 +0200 +++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp 2007-02-22 14:42:15.000000000 +0100 @@ -488,14 +488,6 @@ } -#ifdef XP_MAC -#ifdef DEBUG -#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb") -#else -#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb") -#endif /*DEBUG*/ -#endif /*XP_MAC*/ - static void setOCSPOptions(nsIPrefBranch * pref); NS_IMETHODIMP @@ -689,40 +681,40 @@ const char *possible_ckbi_locations[] = { NS_GRE_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR + NS_XPCOM_CURRENT_PROCESS_DIR, + 0 }; - + for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) { nsCOMPtr mozFile; - directoryService->Get( possible_ckbi_locations[il], - NS_GET_IID(nsILocalFile), - getter_AddRefs(mozFile)); + char *fullModuleName = nsnull; + + if (!possible_ckbi_locations[il]) + { + fullModuleName = PR_GetLibraryName(nsnull, "nssckbi"); + } + else + { + directoryService->Get( possible_ckbi_locations[il], + NS_GET_IID(nsILocalFile), + getter_AddRefs(mozFile)); - if (!mozFile) { - continue; + if (!mozFile) { + continue; + } + + nsCAutoString processDir; + mozFile->GetNativePath(processDir); + fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); } - char *fullModuleName = nsnull; -#ifdef XP_MAC - nsCAutoString nativePath; - mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files")); - mozFile->AppendNative(LOADABLE_CERTS_MODULE); - mozFile->GetNativePath(nativePath); - fullModuleName = (char *) nativePath.get(); -#else - nsCAutoString processDir; - mozFile->GetNativePath(processDir); - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); -#endif /* If a module exists with the same name, delete it. */ NS_ConvertUCS2toUTF8 modNameUTF8(modName); int modType; SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType); SECStatus rv_add = SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0); -#ifndef XP_MAC - PR_Free(fullModuleName); // allocated by NSPR -#endif + PR_FreeLibraryName(fullModuleName); // allocated by NSPR if (SECSuccess == rv_add) { // found a module, no need to try other directories break; --- mozilla/security/manager/ssl/src/Makefile.in.ccc 2005-08-03 07:24:18.000000000 +0200 +++ mozilla/security/manager/ssl/src/Makefile.in 2007-02-22 14:42:15.000000000 +0100 @@ -123,8 +123,13 @@ # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's +ifdef MOZ_NATIVE_NSS +LOCAL_INCLUDES += $(NSS_CFLAGS) \ + $(NULL) +else LOCAL_INCLUDES += -I$(DIST)/public/nss \ $(NULL) +endif EXTRA_DSO_LDOPTS += \ $(MOZ_UNICHARUTIL_LIBS) \ --- mozilla/security/manager/Makefile.in.ccc 2007-02-22 14:42:14.000000000 +0100 +++ mozilla/security/manager/Makefile.in 2007-02-22 14:45:44.000000000 +0100 @@ -46,6 +46,8 @@ MODULE = psm PACKAGE_FILE = psm.pkg + +ifndef MOZ_NATIVE_NSS PACKAGE_VARS += \ NSS3_LIB \ SMIME3_LIB \ @@ -60,6 +62,7 @@ $(NULL) LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) +endif NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) @@ -200,6 +203,7 @@ export:: .nss.cleaned .nss.cleaned: .nss.checkout +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean ifndef SKIP_CHK @@ -207,9 +211,12 @@ $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean endif touch $@ +endif .nss.checkout: +ifndef MOZ_NATIVE_NSS touch $(srcdir)/$@ +endif dependclean export packages chrome:: $(MAKE) -C boot $@ @@ -220,12 +227,15 @@ endif libs:: +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) +endif ifeq ($(OS_ARCH),WINNT) cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) else cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) endif +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) @@ -307,6 +317,7 @@ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin endif endif +endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C locales $@ @@ -315,6 +326,7 @@ endif install:: +ifndef MOZ_NATIVE_NSS $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) ifndef SKIP_CHK $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) @@ -351,6 +363,7 @@ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) endif +endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C locales $@ @@ -365,15 +378,18 @@ ifdef MOZ_XUL $(MAKE) -C pki $@ endif +ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean ifndef SKIP_CHK $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean endif +endif echo-requires-recursive:: $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C pki $@ $(MAKE) -C locales $@ + firefox-1.5-pango-printing.patch: config/system-headers | 3 gfx/src/freetype/nsFreeType.cpp | 18 gfx/src/freetype/nsFreeType.h | 7 gfx/src/gtk/mozilla-decoder.cpp | 71 +- gfx/src/gtk/mozilla-decoder.h | 28 gfx/src/gtk/nsDeviceContextGTK.cpp | 4 gfx/src/gtk/nsFontMetricsPango.cpp | 1226 ++++++++++++++++++++++++------------ gfx/src/gtk/nsFontMetricsPango.h | 160 +++- gfx/src/gtk/nsFontMetricsUtils.cpp | 21 gfx/src/ps/Makefile.in | 12 gfx/src/ps/nsDeviceContextPS.cpp | 56 + gfx/src/ps/nsFontMetricsPS.cpp | 305 ++++++++ gfx/src/ps/nsFontMetricsPS.h | 68 + gfx/src/ps/nsPostScriptObj.cpp | 124 +++ gfx/src/ps/nsPostScriptObj.h | 32 gfx/src/ps/nsRenderingContextPS.cpp | 206 ------ gfx/src/ps/nsRenderingContextPS.h | 11 gfx/src/ps/nsType1.cpp | 261 +++++-- gfx/src/ps/nsType1.h | 3 19 files changed, 1787 insertions(+), 829 deletions(-) Index: firefox-1.5-pango-printing.patch =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/firefox-1.5-pango-printing.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- firefox-1.5-pango-printing.patch 23 Dec 2006 21:05:09 -0000 1.3 +++ firefox-1.5-pango-printing.patch 2 Mar 2007 14:14:43 -0000 1.4 @@ -2904,17 +2904,6 @@ } #ifdef MOZ_ENABLE_XFT -@@ -2336,8 +2589,8 @@ - - nsXftType1Generator::~nsXftType1Generator() - { -- if (mEntry->mFace) -- FT_Done_Face(mEntry->mFace); -+ if (mEntry->mFace) -+ FT_Done_Face(mEntry->mFace); - - if (FT_Done_FreeType(mFreeTypeLibrary)) - return; @@ -2357,8 +2610,8 @@ } Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- thunderbird.spec 12 Feb 2007 10:23:26 -0000 1.93 +++ thunderbird.spec 2 Mar 2007 14:14:43 -0000 1.94 @@ -7,8 +7,8 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 1.5.0.9 -Release: 8%{?dist} +Version: 1.5.0.10 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPL Group: Applications/Internet @@ -18,7 +18,7 @@ %define tarball thunderbird-1.5rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20061215.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20070301.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -30,9 +30,9 @@ # Build patches Patch2: firefox-1.0-prdtoa.patch -Patch4: firefox-1.5-with-system-nss.patch +Patch4: firefox-1.5.0.10-with-system-nss.patch Patch5: thunderbird-1.5-visibility.patch -Patch6: firefox-1.1-nss-system-nspr.patch +Patch6: firefox-1.5.0.10-nss-system-nspr.patch Patch10: thunderbird-0.7.3-psfonts.patch Patch11: thunderbird-0.7.3-gnome-uriloader.patch @@ -137,7 +137,7 @@ %patch102 -p0 -b .theme-change %patch103 -p1 -b .profile-migrator -%patch104 -p1 -b .dnd-nograb +#%patch104 -p1 -b .dnd-nograb %if %{official_branding} # Required by Mozilla Corporation @@ -277,6 +277,9 @@ #=============================================================================== %changelog +* Fri Mar 2 2007 Martin Stransky 1.5.0.10-1 +- Update to 1.5.0.10 + * Mon Feb 12 2007 Martin Stransky 1.5.0.9-8 - added fix for #227406: garbage characters on some websites (when pango is disabled) --- firefox-1.1-nss-system-nspr.patch DELETED --- --- firefox-1.5-with-system-nss.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 14:16:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 09:16:28 -0500 Subject: rpms/thunderbird/devel sources,1.19,1.20 Message-ID: <200703021416.l22EGScT018080@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18065 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 23 Dec 2006 21:05:09 -0000 1.19 +++ sources 2 Mar 2007 14:16:26 -0000 1.20 @@ -1,2 +1,2 @@ -bb74629a8d99a6653c5ab978cf9c6227 thunderbird-1.5.0.9-source.tar.bz2 -f38fb250f9c6946912af14930c2cc8e3 thunderbird-langpacks-1.5.0.9-20061215.tar.bz2 +65087f8a7adb0773ae7198ec21cc2975 thunderbird-1.5.0.10-source.tar.bz2 +0ac9a4a17d12422858c07fe553ee9ac2 thunderbird-langpacks-1.5.0.10-20070301.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 2 14:19:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 09:19:16 -0500 Subject: rpms/xsane/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xsane.spec, 1.43, 1.44 Message-ID: <200703021419.l22EJGwY027124@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/xsane/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19867 Modified Files: .cvsignore sources xsane.spec Log Message: version 0.993 (#230706) Resolves: #230706 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xsane/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 28 Aug 2006 07:06:05 -0000 1.14 +++ .cvsignore 2 Mar 2007 14:19:13 -0000 1.15 @@ -1 +1 @@ -xsane-0.991.tar.gz +xsane-0.993.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xsane/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 28 Aug 2006 07:06:05 -0000 1.14 +++ sources 2 Mar 2007 14:19:13 -0000 1.15 @@ -1 +1 @@ -cded872f2e7041f4a0f2dc4f0bbc5a77 xsane-0.991.tar.gz +7e6b14ce674cdd95fa3d3afe6fee0a11 xsane-0.993.tar.gz Index: xsane.spec =================================================================== RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- xsane.spec 25 Oct 2006 06:36:11 -0000 1.43 +++ xsane.spec 2 Mar 2007 14:19:13 -0000 1.44 @@ -2,8 +2,8 @@ Name: xsane Summary: An X Window System front-end for the SANE scanner interface. -Version: 0.991 -Release: 4%{?dist} +Version: 0.993 +Release: 1%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane.desktop Source2: xsane.conf.in @@ -117,6 +117,9 @@ fi %changelog +* Fri Mar 02 2007 Nils Philippsen - 0.993-1 +- version 0.993 (#230706) + * Wed Oct 25 2006 Nils Philippsen - 0.991-4 - fix typo in scriptlet (#212063) From fedora-cvs-commits at redhat.com Fri Mar 2 14:20:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 09:20:11 -0500 Subject: rpms/glib-java/devel glib-java.spec,1.49,1.50 Message-ID: <200703021420.l22EKBi0011316@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/glib-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11302 Modified Files: glib-java.spec Log Message: - Force -fPIC and avoid -Wall with gcj/ecj. Index: glib-java.spec =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- glib-java.spec 27 Feb 2007 18:50:15 -0000 1.49 +++ glib-java.spec 2 Mar 2007 14:20:09 -0000 1.50 @@ -15,7 +15,7 @@ Summary: Base Library for the Java-GNOME libraries Name: %{java_pkg_prefix}%{name_base} Version: 0.2.6 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://java-gnome.sourceforge.net Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2 Patch0: %{name}-gjavah.patch @@ -57,11 +57,11 @@ export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig fi -%configure - -# FIXME: find a better solution for this -sed -i 's/^pic_flag=\"\"/pic_flag=\"\ \-fPIC\"/' libtool -sed -i 's/^compiler_c_o=\"no\"/compiler_c_o=\"yes\"/' libtool +# Two workarounds: +# 1) libtool.m4 calls gcj with $CFLAGS and gcj seems to choke on -Wall. +# 2) libtool does not use pic_flag when compiling, so we have to force it. +RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wall /} +%configure CFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="-O2 -fPIC" make %{?_smp_mflags} @@ -119,6 +119,9 @@ %{_datadir}/java/*.zip %changelog +* Fri Mar 2 2007 Stepan Kasal - 0.2.6-7 +- Force -fPIC and avoid -Wall with gcj/ecj. + * Tue Feb 27 2007 Stepan Kasal - 0.2.6-6 - The gjavah patch should change configure.ac first, then configure. From fedora-cvs-commits at redhat.com Fri Mar 2 14:28:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 09:28:17 -0500 Subject: rpms/dovecot/devel .cvsignore, 1.18, 1.19 dovecot.spec, 1.67, 1.68 sources, 1.19, 1.20 Message-ID: <200703021428.l22ESHwe011483@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/dovecot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11459 Modified Files: .cvsignore dovecot.spec sources Log Message: * Fri Mar 02 2007 Tomas Janousek - 1.0-5.rc25 - update to latest upstream, little specfile tweaks * Sun Feb 25 2007 Jef Spaleta - 1.0-4.rc22 - Merge review changes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 8 Feb 2007 14:05:59 -0000 1.18 +++ .cvsignore 2 Mar 2007 14:28:15 -0000 1.19 @@ -1 +1 @@ -dovecot-1.0.rc22.tar.gz +dovecot-1.0.rc25.tar.gz Index: dovecot.spec =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- dovecot.spec 8 Feb 2007 14:06:00 -0000 1.67 +++ dovecot.spec 2 Mar 2007 14:28:15 -0000 1.68 @@ -1,15 +1,15 @@ Summary: Dovecot Secure imap server Name: dovecot Version: 1.0 -Release: 3.rc22%{?dist} +Release: 5.rc25%{?dist} License: LGPL Group: System Environment/Daemons %define build_postgres 1 %define build_mysql 1 -%define upstream 1.0.rc22 +%define upstream 1.0.rc25 -Source: %{name}-%{upstream}.tar.gz +Source: http://www.dovecot.org/releases/%{name}-%{upstream}.tar.gz Source1: dovecot.init Source2: dovecot.pam Source3: maildir-migration.txt @@ -21,7 +21,8 @@ Patch101: dovecot-1.0.beta2-pam-tty.patch Patch102: dovecot-1.0.rc2-pam-setcred.patch Patch103: dovecot-1.0.beta2-mkcert-permissions.patch -Patch104: dovecot-1.0.beta2-lib64.patch +# 104 not applied +#Patch104: dovecot-1.0.beta2-lib64.patch Patch105: dovecot-1.0.rc7-mkcert-paths.patch #Patch105: dovecot-1.0.beta2-sqlite-check.patch @@ -43,7 +44,13 @@ # gettext-devel is needed for running autoconf because of the # presence of AM_ICONV BuildRequires: gettext-devel -Prereq: openssl >= 0.9.7f-4, /sbin/chkconfig, /usr/sbin/useradd +# Explicit Runtime Requirements +Requires: openssl >= 0.9.7f-4 +# Package includes an initscript service file, needs to require initscripts package +Requires: initscripts +Requires(pre): /sbin/chkconfig, /usr/sbin/useradd, /sbin/service, /bin/touch, /bin/rm +Requires(post): /sbin/chkconfig, /usr/sbin/useradd, /sbin/chkconfig, /bin/mv, /bin/rm +Requires(preun): /usr/sbin/userdel, /usr/sbin/groupdel, /sbin/chkconfig, /sbin/service %if %{build_postgres} BuildRequires: postgresql-devel @@ -81,7 +88,7 @@ autoreconf %configure \ INSTALL_DATA="install -c -p -m644" \ - --with-doc \ + --with-doc \ %if %{build_postgres} --with-pgsql \ %endif @@ -100,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name} +#remove the static libs and libtool archives +find $RPM_BUILD_ROOT/%{_libdir}/%{name}/ -name '*.a' -or -name '*.la' | xargs rm -f +rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/dovecot-config + mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/dovecot @@ -125,18 +136,23 @@ install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/dovecot-openssl.cnf $RPM_BUILD_ROOT/%{ssldir}/dovecot-openssl.cnf # Install some of our own documentation -install -p -m644 $RPM_SOURCE_DIR/dovecot-REDHAT-FAQ.txt $RPM_BUILD_ROOT%{docdir}/REDHAT-FAQ.txt +install -p -m644 %{SOURCE7} $RPM_BUILD_ROOT%{docdir}/REDHAT-FAQ.txt + +# Install the licensing files into the documentation area +install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/COPYING $RPM_BUILD_ROOT%{docdir}/COPYING +install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/COPYING.MIT $RPM_BUILD_ROOT%{docdir}/COPYING.MIT +install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/COPYING.LGPL $RPM_BUILD_ROOT%{docdir}/COPYING.LGPL mkdir -p $RPM_BUILD_ROOT%{docdir}/examples/ -install -p -m755 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/mkcert.sh $RPM_BUILD_ROOT%{docdir}/examples/mkcert.sh +install -p -m755 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/mkcert.sh $RPM_BUILD_ROOT%{_libexecdir}/%{name}/mkcert.sh for f in `cd $RPM_BUILD_DIR/dovecot-%{upstream}/doc; echo *.conf`; do - install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/$f $RPM_BUILD_ROOT%{docdir}/examples/$f; + install -p -m644 $RPM_BUILD_DIR/dovecot-%{upstream}/doc/$f $RPM_BUILD_ROOT%{docdir}/examples/$f; done install -p -m755 -d $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration -for f in maildir-migration.txt migrate-folders migrate-users perfect_maildir.pl +for f in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} do - install -p -m644 $RPM_SOURCE_DIR/$f $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration + install -p -m644 $f $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration done mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version} @@ -168,7 +184,7 @@ fi if [ ! -f %{ssldir}/certs/%{name}.pem ]; then SSLDIR=%{ssldir} OPENSSLCONFIG=%{ssldir}/dovecot-openssl.cnf \ - %{docdir}-%{version}/examples/mkcert.sh &> /dev/null + %{_libexecdir}/%{name}/mkcert.sh &> /dev/null fi if ! test -f /var/run/dovecot/login/ssl-parameters.dat; then @@ -196,25 +212,32 @@ %files %defattr(-,root,root) -%doc %{docdir}-%{version} +%doc %{docdir}-%{version} %config(noreplace) %{_sysconfdir}/dovecot.conf %config %{_sysconfdir}/rc.d/init.d/dovecot -%config %{_sysconfdir}/pam.d/dovecot +%config(noreplace) %{_sysconfdir}/pam.d/dovecot +%dir %{ssldir} +%dir %{ssldir}/certs %config(noreplace) %{ssldir}/dovecot-openssl.cnf %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/certs/dovecot.pem %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/private/dovecot.pem -%dir %{_libexecdir}/%{name} %{_libexecdir}/%{name} %{_libdir}/%{name} %{_sbindir}/dovecot %{_sbindir}/dovecotpw %attr(0755,root,dovecot) %dir /var/run/dovecot %attr(0750,root,dovecot) %dir /var/run/dovecot/login -%attr(0750,root,dovecot) %{docdir}-%{version}/examples/mkcert.sh +#%attr(0755,root,dovecot) %{_libexecdir}/%{name}/mkcert.sh %attr(0750,dovecot,dovecot) %dir /var/lib/dovecot %changelog +* Fri Mar 02 2007 Tomas Janousek - 1.0-5.rc25 +- update to latest upstream + +* Sun Feb 25 2007 Jef Spaleta - 1.0-4.rc22 +- Merge review changes + * Thu Feb 08 2007 Tomas Janousek - 1.0-3.rc22 - update to latest upstream, fixes a few bugs @@ -559,8 +582,8 @@ - clean up description and %%preun - add dovecot user (uid/gid of 97) - add some buildrequires -- move the ssl cert to %{_datadir}/ssl/certs -- create a dummy ssl cert in %post +- move the ssl cert to %%{_datadir}/ssl/certs +- create a dummy ssl cert in %%post - own /var/run/dovecot - make the config file a source so we get default mbox locks of fcntl Index: sources =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Feb 2007 14:06:00 -0000 1.19 +++ sources 2 Mar 2007 14:28:15 -0000 1.20 @@ -1 +1 @@ -d5bd3ce8ba7ca2ee9f563fe63a1f700a dovecot-1.0.rc22.tar.gz +14e9981e9828a65526b8e683657434d4 dovecot-1.0.rc25.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 2 14:31:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 09:31:10 -0500 Subject: rpms/fonts-japanese/devel fonts-japanese.spec,1.20,1.21 Message-ID: <200703021431.l22EVAOI019175@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/fonts-japanese/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11576 Modified Files: fonts-japanese.spec Log Message: * Fri Mar 2 2007 Akira TAGOH - more cleanups. Index: fonts-japanese.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fonts-japanese.spec 1 Mar 2007 13:17:49 -0000 1.20 +++ fonts-japanese.spec 2 Mar 2007 14:31:06 -0000 1.21 @@ -1,94 +1,94 @@ -%define language japanese -%define basefontdir %{_datadir}/fonts/%{language} -%define ttfontdir %{basefontdir}/TrueType -%define bmpfontdir %{basefontdir}/misc -%define cidmapdir %{_sysconfdir}/ghostscript -%define chxlfd /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/chbdfxlfd.pl -%define mkalias /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkalias.pl -%define mkbold $RPM_BUILD_DIR/%{name}-%{version}/%{shinonome}-src/tools/mkbold -%define mkitalic $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkitalic +%define language japanese +%define basefontdir %{_datadir}/fonts/%{language} +%define ttfontdir %{basefontdir}/TrueType +%define bmpfontdir %{basefontdir}/misc +%define cidmapdir %{_sysconfdir}/ghostscript +%define chxlfd /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/chbdfxlfd.pl +%define mkalias /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkalias.pl +%define mkbold $RPM_BUILD_DIR/%{name}-%{version}/%{shinonome}-src/tools/mkbold +%define mkitalic $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkitalic -%define sazanami sazanami-20061016 +%define sazanami sazanami-20061016 ## FIXME: the below lines will be removed in the future. -#%%define substname kochi-substitute -#%%define substver 20030809 -#%%define kochisubst %{substname}-%{substver} -#%%define ksnonaga10 %{substname}-nonaga10-%{substver} +#%%define substname kochi-substitute +#%%define substver 20030809 +#%%define kochisubst %{substname}-%{substver} +#%%define ksnonaga10 %{substname}-nonaga10-%{substver} # -%define kappa Kappa20-0.396 -%define shinonome shinonome-0.9.11 -%define warabi12 warabi12-0.19a -%define mplus mplus_bitmap_fonts-2.2.4 -%define vft vine-fonttools-0.1 - -Name: fonts-japanese -Version: 0.20061016 -Release: 3%{?dist} -License: Distributable -Group: User Interface/X -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gzip xorg-x11-font-utils +%define kappa Kappa20-0.396 +%define shinonome shinonome-0.9.11 +%define warabi12 warabi12-0.19a +%define mplus mplus_bitmap_fonts-2.2.4 +%define vft vine-fonttools-0.1 + +Name: fonts-japanese +Version: 0.20061016 +Release: 3%{?dist} +License: Distributable +Group: User Interface/X +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gzip xorg-x11-font-utils ## files in ttfonts-ja -Source0: http://prdownloads.sourceforge.jp/efont/9934/%{sazanami}.tar.bz2 -Source1: fonts.alias.sz -Source2: FAPIcidfmap.ja -Source3: cidfmap.ja -Source4: CIDFnmap.ja +Source0: http://prdownloads.sourceforge.jp/efont/9934/%{sazanami}.tar.bz2 +Source1: fonts.alias.sz +Source2: FAPIcidfmap.ja +Source3: cidfmap.ja +Source4: CIDFnmap.ja ## FIXME: the below lines will be removed in the future. -## Source0: http://downloads.sourceforge.jp/efont/4767/%{kochisubst}.tar.bz2 -#Source5: %{ksnonaga10}.tar.bz2 -#Source6: fonts.alias.kk +## Source0: http://downloads.sourceforge.jp/efont/4767/%{kochisubst}.tar.bz2 +#Source5: %{ksnonaga10}.tar.bz2 +#Source6: fonts.alias.kk ## files in jisksp14 -Source10: jisksp14.bdf.gz +Source10: jisksp14.bdf.gz ## files in jisksp16-1990 -Source20: jisksp16-1990.bdf.gz +Source20: jisksp16-1990.bdf.gz ## files in kappa20 ## files in knm_new -Source40: http://www.din.or.jp/~storm/fonts/knm_new.tar.gz -Source41: ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/kaname_k12_bdf.tar.gz +Source40: http://www.din.or.jp/~storm/fonts/knm_new.tar.gz +Source41: ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/kaname_k12_bdf.tar.gz ## files in fonts-ja -Source50: xfonts_jp.tgz -Source51: http://kappa.allnet.ne.jp/20dot.fonts/%{kappa}.tar.bz2 -Source52: http://openlab.ring.gr.jp/efont/dist/shinonome/%{shinonome}-src.tar.bz2 +Source50: xfonts_jp.tgz +Source51: http://kappa.allnet.ne.jp/20dot.fonts/%{kappa}.tar.bz2 +Source52: http://openlab.ring.gr.jp/efont/dist/shinonome/%{shinonome}-src.tar.bz2 ## http://mlnews.com/marumoji/ -Source53: marumoji.tgz +Source53: marumoji.tgz # JIS X 0213-2000 fonts (14pxl, 16pxl) # http://www.mars.sphere.ne.jp/imamura/jisx0213.html # http://www.mars.sphere.ne.jp/imamura/K14-1.bdf.gz # http://www.mars.sphere.ne.jp/imamura/K14-2.bdf.gz # http://www.mars.sphere.ne.jp/imamura/jiskan16-2000-1.bdf.gz # http://www.mars.sphere.ne.jp/imamura/jiskan16-2000-2.bdf.gz -Source54: imamura-jisx0213.tgz +Source54: imamura-jisx0213.tgz # jiskan16 JIS X 0208:1990 by Yasuoka # http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/ -Source55: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskan16-1990.bdf.Z +Source55: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskan16-1990.bdf.Z # jiskan16 JIS X 0208:1997 Old Kanji -Source56: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskano16-1997.bdf.Z +Source56: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jiskano16-1997.bdf.Z # k14 Old-Kanji -Source57: http://www.hlla.is.tsukuba.ac.jp/~kourai/software/k14-oldkanji.tar.gz +Source57: http://www.hlla.is.tsukuba.ac.jp/~kourai/software/k14-oldkanji.tar.gz ## k14 invalid glyphs patch ## http://kappa.allnet.ne.jp/kanou/fonts/k14-patch.html # Warabi12 (12pxl) jisx0213 # http://www.gelgoog.org/warabi12/ -Source58: http://www.gelgoog.org/warabi12/archives/%{warabi12}.tar.gz +Source58: http://www.gelgoog.org/warabi12/archives/%{warabi12}.tar.gz # mplus fonts # http://mplus-fonts.sourceforge.jp/ -Source59: http://prdownloads.sourceforge.jp/mplus-fonts/5030/%{mplus}.tar.gz -Source60: %{vft}.tgz +Source59: http://prdownloads.sourceforge.jp/mplus-fonts/5030/%{mplus}.tar.gz +Source60: %{vft}.tgz -Patch50: http://kappa.allnet.ne.jp/kanou/fonts/k14.patch +Patch50: http://kappa.allnet.ne.jp/kanou/fonts/k14.patch # k14 to jisx0208.1990 patch # http://www.brl.ntt.co.jp/people/takada/goodies/k14-1990/ # http://www.brl.ntt.co.jp/people/takada/goodies/k14-1990/patch.txt -Patch51: k14-1990.patch -Patch52: fonts-ja-8.0-gcc-warnings.patch -Patch53: mplus_bitmap_fonts-install.patch -Patch54: fonttools-replace.patch +Patch51: k14-1990.patch +Patch52: fonts-ja-8.0-gcc-warnings.patch +Patch53: mplus_bitmap_fonts-install.patch +Patch54: fonttools-replace.patch -Summary: Free Japanese Bitmap/TrueType fonts +Summary: Free Japanese Bitmap/TrueType fonts Requires(post): ttmkfdir >= 3.0.6, mkfontdir, /usr/bin/fc-cache, /usr/sbin/chkfontpath Requires(postun): /usr/bin/fc-cache, /usr/sbin/chkfontpath @@ -200,13 +200,13 @@ 12x24a/ 12x24rk/ jiskan24/ " ALL_BOLD_BDF_FONT="\ -mplus_f10WEIGHT-euro/-r mplus_f10WEIGHT/-r \ -mplus_f12WEIGHT-euro/-r mplus_f12WEIGHT-jisx0201/-r mplus_f12WEIGHT/-r \ -mplus_h10WEIGHT-euro/-r mplus_h10WEIGHT-jisx0201/-r mplus_h10WEIGHT/-r \ -mplus_h12WEIGHT-euro/-r mplus_h12WEIGHT-jisx0201/-r mplus_h12WEIGHT/-r \ -mplus_j10WEIGHT-iso/-r mplus_j10WEIGHT-jisx0201/-r mplus_j10WEIGHT/-r \ -mplus_j12WEIGHT/-r \ -mplus_s10WEIGHT-euro/-r mplus_s10WEIGHT/-r +mplus_f10WEIGHT-euro/-r mplus_f10WEIGHT/-r \ +mplus_f12WEIGHT-euro/-r mplus_f12WEIGHT-jisx0201/-r mplus_f12WEIGHT/-r \ +mplus_h10WEIGHT-euro/-r mplus_h10WEIGHT-jisx0201/-r mplus_h10WEIGHT/-r \ +mplus_h12WEIGHT-euro/-r mplus_h12WEIGHT-jisx0201/-r mplus_h12WEIGHT/-r \ +mplus_j10WEIGHT-iso/-r mplus_j10WEIGHT-jisx0201/-r mplus_j10WEIGHT/-r \ +mplus_j12WEIGHT/-r \ +mplus_s10WEIGHT-euro/-r mplus_s10WEIGHT/-r " gcc $RPM_OPT_FLAGS %{vft}/mkitalic.c -o %{vft}/mkitalic @@ -255,14 +255,14 @@ ISO8859-1 12 shnm6x12a shnm6x12a shnm6x12a shnm6x12a \ ISO8859-1 14 7x14a 7x14a 7x14a 7x14a \ ISO8859-1 16 shnm8x16a shnm8x16a shnm8x16a shnm8x16a \ -ISO8859-1 18 shnm9x18a shnm9x18a shnm9x18a shnm9x18a \ +ISO8859-1 18 shnm9x18a shnm9x18a shnm9x18a shnm9x18a \ ISO8859-1 20 10x20rk 10x20rk - 10x20rk \ ISO8859-1 24 12x24a 12x24a - 12x24a \ JISX0201.1976-0 10 mplus_j10WEIGHT-jisx0201 mplus_j10WEIGHT-jisx0201 mplus_j10WEIGHT-jisx0201 mplus_j10WEIGHT-jisx0201 \ JISX0201.1976-0 12 shnm6x12r shnm6x12r shnm6x12r shnm6x12r \ JISX0201.1976-0 14 7x14rk 7x14rk 7x14rk 7x14rk \ JISX0201.1976-0 16 shnm8x16r shnm8x16r shnm8x16r shnm8x16r \ -JISX0201.1976-0 18 shnm9x18r shnm9x18r shnm9x18r shnm9x18r \ +JISX0201.1976-0 18 shnm9x18r shnm9x18r shnm9x18r shnm9x18r \ JISX0201.1976-0 20 10x20rk 10x20rk - 10x20rk \ JISX0201.1976-0 24 12x24rk 12x24rk - 12x24rk \ JISX0208.1983-0 10 mplus_j10WEIGHT mplus_j10WEIGHT mplus_j10WEIGHT - \ @@ -350,24 +350,24 @@ { umask 133 touch %{ttfontdir} 2> /dev/null && { - /usr/bin/ttmkfdir -d %{ttfontdir} -o %{ttfontdir}/fonts.scale - mkfontdir %{ttfontdir} - /usr/sbin/chkfontpath -q -a %{ttfontdir} + /usr/bin/ttmkfdir -d %{ttfontdir} -o %{ttfontdir}/fonts.scale + mkfontdir %{ttfontdir} + /usr/sbin/chkfontpath -q -a %{ttfontdir} } mkfontdir %{bmpfontdir} && /usr/sbin/chkfontpath -q -a %{bmpfontdir} if [ -x /usr/bin/fc-cache ]; then - /usr/bin/fc-cache /usr/share/fonts + /usr/bin/fc-cache /usr/share/fonts fi } %postun { if [ "$1" = "0" ]; then - /usr/sbin/chkfontpath -q -r %{ttfontdir} - /usr/sbin/chkfontpath -q -r %{bmpfontdir} - if [ -x /usr/bin/fc-cache ]; then - /usr/bin/fc-cache /usr/share/fonts - fi + /usr/sbin/chkfontpath -q -r %{ttfontdir} + /usr/sbin/chkfontpath -q -r %{bmpfontdir} + if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache /usr/share/fonts + fi fi } @@ -397,6 +397,9 @@ %config %{cidmapdir}/CIDFnmap.ja %changelog +* Fri Mar 2 2007 Akira TAGOH +- more cleanups. + * Thu Mar 1 2007 Akira TAGOH - 0.20061016-3 - cleanup spec file. - updated mplus to 2.2.4 From fedora-cvs-commits at redhat.com Fri Mar 2 14:36:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 09:36:17 -0500 Subject: rpms/kasumi/FC-5 .cvsignore, 1.7, 1.8 kasumi.spec, 1.16, 1.17 sources, 1.6, 1.7 kasumi-1.0-gcc41.patch, 1.1, NONE kasumi-2.0.1-errorcode.patch, 1.1, NONE kasumi.desktop, 1.2, NONE Message-ID: <200703021436.l22EaHLU028061@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/kasumi/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27983 Modified Files: .cvsignore kasumi.spec sources Removed Files: kasumi-1.0-gcc41.patch kasumi-2.0.1-errorcode.patch kasumi.desktop Log Message: * Fri Mar 2 2007 Akira TAGOH - 2.2-1 - Updated to 2.2 - Remove kasumi-2.0.1-errorcode.patch. no longer needed. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kasumi/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jun 2006 12:07:12 -0000 1.7 +++ .cvsignore 2 Mar 2007 14:36:15 -0000 1.8 @@ -7,3 +7,4 @@ kasumi-1.0.tar.gz kasumi-2.0.tar.gz kasumi-2.0.1.tar.gz +kasumi-2.2.tar.gz Index: kasumi.spec =================================================================== RCS file: /cvs/dist/rpms/kasumi/FC-5/kasumi.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- kasumi.spec 14 Jul 2006 10:01:19 -0000 1.16 +++ kasumi.spec 2 Mar 2007 14:36:15 -0000 1.17 @@ -1,31 +1,27 @@ Name: kasumi -Version: 2.0.1 -Release: 1%{?dist}.1 +Version: 2.2 +Release: 1%{?dist} License: GPL URL: http://kasumi.sourceforge.jp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf Source0: %{name}-%{version}.tar.gz -Source1: %{name}.desktop -Patch0: kasumi-1.0-gcc41.patch -Patch1: kasumi-2.0.1-errorcode.patch +#Patch0: kasumi-1.0-gcc41.patch Summary: An anthy dictionary management tool. Group: Applications/Text -Requires: anthy >= 7900 %description Kasumi is a dictionary management tool for Anthy. %prep %setup -q -%patch0 -p1 -b .gcc41 -%patch1 -p1 -b .errcode -aclocal -automake --add-missing -autoconf +#%%patch0 -p1 -b .gcc41 +#aclocal +#automake --add-missing +#autoconf %build %configure @@ -40,7 +36,8 @@ --vendor fedora \ --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE1} + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} @@ -53,12 +50,17 @@ %files -f %{name}.lang %defattr(-,root,root, -) %{_bindir}/kasumi -%{_datadir}/kasumi +%{_mandir}/man1/kasumi.1* +%{_datadir}/pixmaps/kasumi.png %{_datadir}/applications/fedora-kasumi.desktop %doc AUTHORS COPYING ChangeLog NEWS README %changelog +* Fri Mar 2 2007 Akira TAGOH - 2.2-1 +- Updated to 2.2 +- Remove kasumi-2.0.1-errorcode.patch. no longer needed. + * Fri Jul 14 2006 Akira TAGOH - 2.0.1-1.fc5.1 - kasumi-2.0.1-errorcode.patch: fixed not working when the private dictionary is empty. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kasumi/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jun 2006 12:07:12 -0000 1.6 +++ sources 2 Mar 2007 14:36:15 -0000 1.7 @@ -1,2 +1 @@ -f2b080cbea0bac90fadcc8cfcc500460 kasumi-2.0.tar.gz -03c03a261c63d2c8cd4bdcc77a55d7eb kasumi-2.0.1.tar.gz +d0c3a605fc95b89d4e102ffdd0b4c37d kasumi-2.2.tar.gz --- kasumi-1.0-gcc41.patch DELETED --- --- kasumi-2.0.1-errorcode.patch DELETED --- --- kasumi.desktop DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 14:58:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 09:58:43 -0500 Subject: rpms/cups/FC-6 cups-lspp.patch,1.17,1.18 cups.spec,1.318,1.319 Message-ID: <200703021458.l22EwhmS006004@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5549 Modified Files: cups-lspp.patch cups.spec Log Message: * Fri Mar 2 2007 Tim Waugh 1:1.2.8-3 - Updated LSPP patch (bug #229673). - Resolves: rhbz#229673 cups-lspp.patch: Makedefs.in | 4 config-scripts/cups-lspp.m4 | 36 +++ config.h.in | 7 configure.in | 2 cups/cups.h | 9 data/Makefile | 5 data/mls | 277 ++++++++++++++++++++++++++ data/selinux | 277 ++++++++++++++++++++++++++ data/te | 277 ++++++++++++++++++++++++++ scheduler/client.c | 170 ++++++++++++++++ scheduler/client.h | 14 + scheduler/conf.c | 46 ++++ scheduler/conf.h | 7 scheduler/ipp.c | 457 ++++++++++++++++++++++++++++++++++++++++++++ scheduler/job.c | 275 ++++++++++++++++++++++++++ scheduler/job.h | 11 + scheduler/main.c | 32 +++ scheduler/printers.c | 51 ++++ 18 files changed, 1953 insertions(+), 4 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.17 -r 1.18 cups-lspp.patch Index: cups-lspp.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups-lspp.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- cups-lspp.patch 27 Nov 2006 15:02:10 -0000 1.17 +++ cups-lspp.patch 2 Mar 2007 14:58:40 -0000 1.18 @@ -1,5 +1,25 @@ ---- /dev/null 2006-11-22 09:23:57.810898750 +0000 -+++ cups-1.2.7/config-scripts/cups-lspp.m4 2006-11-22 11:40:42.000000000 +0000 +--- cups-1.2.8/Makedefs.in.lspp 2007-03-02 14:06:43.000000000 +0000 ++++ cups-1.2.8/Makedefs.in 2007-03-02 14:06:46.000000000 +0000 +@@ -136,7 +136,7 @@ + @LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM) + LINKCUPS = @LINKCUPS@ $(SSLLIBS) + LINKCUPSIMAGE = @LINKCUPSIMAGE@ +-LIBS = $(LINKCUPS) $(COMMONLIBS) ++LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ + OPTIM = @OPTIM@ + OPTIONS = + PAMLIBS = @PAMLIBS@ +@@ -239,7 +239,7 @@ + # Rules... + # + +-.SILENT: ++ + .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz + + .c.o: +--- /dev/null 2007-03-02 08:56:41.811642143 +0000 ++++ cups-1.2.8/config-scripts/cups-lspp.m4 2007-03-02 14:06:43.000000000 +0000 @@ -0,0 +1,36 @@ +dnl +dnl LSPP code for the Common UNIX Printing System (CUPS). @@ -37,39 +57,8 @@ + ;; + esac +fi ---- cups-1.2.7/configure.in.lspp 2006-08-04 17:51:58.000000000 +0100 -+++ cups-1.2.7/configure.in 2006-11-22 11:40:42.000000000 +0000 -@@ -47,6 +47,8 @@ - sinclude(config-scripts/cups-pdf.m4) - sinclude(config-scripts/cups-scripting.m4) - -+sinclude(config-scripts/cups-lspp.m4) -+ - INSTALL_LANGUAGES="" - UNINSTALL_LANGUAGES="" - LANGFILES="" ---- cups-1.2.7/Makedefs.in.lspp 2006-11-22 11:40:42.000000000 +0000 -+++ cups-1.2.7/Makedefs.in 2006-11-22 11:40:44.000000000 +0000 -@@ -136,7 +136,7 @@ - @LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM) - LINKCUPS = @LINKCUPS@ $(SSLLIBS) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ --LIBS = $(LINKCUPS) $(COMMONLIBS) -+LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ - OPTIM = @OPTIM@ - OPTIONS = - PAMLIBS = @PAMLIBS@ -@@ -239,7 +239,7 @@ - # Rules... - # - --.SILENT: -+ - .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz - - .c.o: ---- /dev/null 2006-11-22 09:23:57.810898750 +0000 -+++ cups-1.2.7/data/mls 2006-11-22 11:40:42.000000000 +0000 +--- /dev/null 2007-03-02 08:56:41.811642143 +0000 ++++ cups-1.2.8/data/mls 2007-03-02 14:06:43.000000000 +0000 @@ -0,0 +1,277 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -348,8 +337,8 @@ +% End of "$Id$". +% +%%EOF ---- /dev/null 2006-11-22 09:23:57.810898750 +0000 -+++ cups-1.2.7/data/selinux 2006-11-22 11:40:42.000000000 +0000 +--- /dev/null 2007-03-02 08:56:41.811642143 +0000 ++++ cups-1.2.8/data/selinux 2007-03-02 14:06:43.000000000 +0000 @@ -0,0 +1,277 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -628,8 +617,22 @@ +% End of "$Id$". +% +%%EOF ---- /dev/null 2006-11-22 09:23:57.810898750 +0000 -+++ cups-1.2.7/data/te 2006-11-22 11:40:42.000000000 +0000 +--- cups-1.2.8/data/Makefile.lspp 2006-03-19 03:23:34.000000000 +0000 ++++ cups-1.2.8/data/Makefile 2007-03-02 14:06:43.000000000 +0000 +@@ -34,7 +34,10 @@ + secret \ + standard \ + topsecret \ +- unclassified ++ unclassified \ ++ selinux \ ++ mls \ ++ te + + CHARMAPS = \ + euc-cn.txt \ +--- /dev/null 2007-03-02 08:56:41.811642143 +0000 ++++ cups-1.2.8/data/te 2007-03-02 14:06:43.000000000 +0000 @@ -0,0 +1,277 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 @@ -908,23 +911,9 @@ +% End of "$Id$". +% +%%EOF ---- cups-1.2.7/data/Makefile.lspp 2006-03-19 03:23:34.000000000 +0000 -+++ cups-1.2.7/data/Makefile 2006-11-22 11:40:42.000000000 +0000 -@@ -34,7 +34,10 @@ - secret \ - standard \ - topsecret \ -- unclassified -+ unclassified \ -+ selinux \ -+ mls \ -+ te - - CHARMAPS = \ - euc-cn.txt \ ---- cups-1.2.7/config.h.in.lspp 2006-11-02 20:01:54.000000000 +0000 -+++ cups-1.2.7/config.h.in 2006-11-22 11:40:42.000000000 +0000 -@@ -458,6 +458,13 @@ +--- cups-1.2.8/config.h.in.lspp 2007-02-06 16:04:25.000000000 +0000 ++++ cups-1.2.8/config.h.in 2007-03-02 14:06:43.000000000 +0000 +@@ -468,6 +468,13 @@ #undef HAVE_APPLETALK_AT_PROTO_H @@ -938,460 +927,402 @@ #endif /* !_CUPS_CONFIG_H_ */ /* ---- cups-1.2.7/scheduler/printers.c 2006-11-22 11:40:42.000000000 +0000 -+++ cups-1.2.7/scheduler/printers.c 2006-11-22 11:23:38.000000000 +0000 -@@ -57,6 +57,8 @@ - * printing desktop tools. +--- cups-1.2.8/configure.in.lspp 2006-12-06 20:10:16.000000000 +0000 ++++ cups-1.2.8/configure.in 2007-03-02 14:06:43.000000000 +0000 +@@ -48,6 +48,8 @@ + sinclude(config-scripts/cups-pdf.m4) + sinclude(config-scripts/cups-scripting.m4) + ++sinclude(config-scripts/cups-lspp.m4) ++ + INSTALL_LANGUAGES="" + UNINSTALL_LANGUAGES="" + LANGFILES="" +--- cups-1.2.8/cups/cups.h.lspp 2007-01-10 16:23:06.000000000 +0000 ++++ cups-1.2.8/cups/cups.h 2007-03-02 14:06:43.000000000 +0000 +@@ -24,6 +24,9 @@ + * This file is subject to the Apple OS-Developed Software exception. */ ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + + #ifndef _CUPS_CUPS_H_ + # define _CUPS_CUPS_H_ + +@@ -75,6 +78,12 @@ + # define CUPS_DATE_ANY -1 + + ++# ifdef WITH_LSPP ++# define MLS_CONFIG "mls" ++# define TE_CONFIG "te" ++# define SELINUX_CONFIG "SELinux" ++# define UNKNOWN_SL "UNKNOWN SL" ++# endif /* WITH_LSPP */ /* - * Include necessary headers... + * Types and structures... + */ +--- cups-1.2.8/scheduler/client.h.lspp 2007-01-22 22:04:43.000000000 +0000 ++++ cups-1.2.8/scheduler/client.h 2007-03-02 14:06:43.000000000 +0000 +@@ -22,6 +22,13 @@ + * WWW: http://www.cups.org */ -@@ -79,6 +81,10 @@ - static void write_irix_state(cupsd_printer_t *p); - #endif /* __sgi */ ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ +#ifdef WITH_LSPP -+# include [...1790 lines suppressed...] -+ { -+ if (getfilecon(con->filename, &spoolcon) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ return (cupsdCloseClient(con)); -+ } -+ clicon = context_new(con->scon); -+ tmpcon = context_new(spoolcon); -+ freecon(spoolcon); -+ if (!clicon || !tmpcon) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ if (clicon) -+ context_free(clicon); -+ if (tmpcon) -+ context_free(tmpcon); -+ return (cupsdCloseClient(con)); -+ } -+ clirange = strdup(context_range_get(clicon)); -+ if ((cliclearance = strtok(clirange, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, cliclearance) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(clicon))) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ free(clirange); -+ if (setfilecon(con->filename, context_str(tmpcon)) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %s set to %s", -+ con->filename, context_str(tmpcon)); -+ context_free(tmpcon); -+ context_free(clicon); -+ } ++ char *audit_message; /* Audit message string */ ++ char *printerfile; /* Path to a local printer dev */ ++ char *rangestr; /* Printer's range if its available */ ++ security_context_t devcon; /* Printer SELinux context */ ++ context_t printercon; /* context_t for the printer */ +#endif /* WITH_LSPP */ - } - - if (con->http.state != HTTP_POST_SEND) -@@ -3823,6 +3949,50 @@ - #endif /* HAVE_SSL */ + DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, +@@ -1579,6 +1592,44 @@ + attr->values[1].string.text = _cupsStrAlloc(Classification ? + Classification : p->job_sheets[1]); + } +#ifdef WITH_LSPP -+/* -+ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid. -+ */ -+ -+uid_t client_pid_to_auid(pid_t clipid) -+{ -+ uid_t uid; -+ int len, in; -+ char buf[16] = {0}; -+ char fname[32] = {0}; -+ -+ -+ /* -+ * Hopefully this pid is still the one we are interested in. -+ */ -+ snprintf(fname, 32, "/proc/%d/loginuid", clipid); -+ in = open(fname, O_NOFOLLOW|O_RDONLY); -+ -+ if (in < 0) -+ return -1; -+ -+ errno = 0; -+ -+ do { -+ len = read(in, buf, sizeof(buf)); -+ } while (len < 0 && errno == EINTR); -+ -+ close(in); ++ if (AuditLog != -1) ++ { ++ char uri[HTTP_MAX_URI]; ++ audit_message = NULL; ++ rangestr = NULL; ++ printercon = 0; ++ printerfile = strstr(p->device_uri, "/dev/"); ++ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0)) ++ printerfile = strdup(p->device_uri + strlen("file:/")); + -+ if (len < 0 || len >= sizeof(buf)) -+ return -1; ++ if (printerfile != NULL) ++ { ++ if (getfilecon(printerfile, &devcon) == -1) ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context"); ++ else ++ { ++ printercon = context_new(devcon); ++ freecon(devcon); ++ } ++ } + -+ errno = 0; -+ buf[len] = 0; -+ uid = strtol(buf, 0, 10); ++ if (printercon && context_range_get(printercon)) ++ rangestr = strdup(context_range_get(printercon)); ++ else ++ rangestr = strdup("unknown"); + -+ if (errno != 0) -+ return -1; -+ else -+ return uid; -+} ++ cupsdSanitizeURI(p->device_uri, uri, sizeof(uri)); ++ cupsdSetStringf(&audit_message, "printer=%s uri=%s banners=%s,%s range=%s", ++ p->name, uri, p->job_sheets[0], p->job_sheets[1], rangestr); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, ++ ServerName, NULL, NULL, 1); ++ if (printercon) ++ context_free(printercon); ++ free(rangestr); ++ free(audit_message); ++ } +#endif /* WITH_LSPP */ -+ - /* - * 'pipe_command()' - Pipe the output of a command to the remote client. - */ ---- cups-1.2.7/cups/cups.h.lspp 2006-11-14 16:36:36.000000000 +0000 -+++ cups-1.2.7/cups/cups.h 2006-11-22 11:40:42.000000000 +0000 -@@ -24,6 +24,9 @@ - * This file is subject to the Apple OS-Developed Software exception. + } + + printer_type = p->type; +--- cups-1.2.8/scheduler/job.h.lspp 2006-09-19 21:11:08.000000000 +0100 ++++ cups-1.2.8/scheduler/job.h 2007-03-02 14:06:43.000000000 +0000 +@@ -22,6 +22,13 @@ + * WWW: http://www.cups.org */ +/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + - #ifndef _CUPS_CUPS_H_ - # define _CUPS_CUPS_H_ - -@@ -68,6 +71,12 @@ - # define CUPS_DATE_ANY -1 - - -+# ifdef WITH_LSPP -+# define MLS_CONFIG "mls" -+# define TE_CONFIG "te" -+# define SELINUX_CONFIG "SELinux" -+# define UNKNOWN_SL "UNKNOWN SL" -+# endif /* WITH_LSPP */ ++#ifdef WITH_LSPP ++#include ++#endif /* WITH_LSPP */ ++ /* - * Types and structures... + * Job request structure... */ +@@ -55,6 +62,10 @@ + int status; /* Status code from filters */ + cupsd_printer_t *printer; /* Printer this job is assigned to */ + int tries; /* Number of tries for this job */ ++#ifdef WITH_LSPP ++ security_context_t scon; /* Security context of job */ ++ uid_t auid; /* Audit loginuid for this job */ ++#endif /* WITH_LSPP */ + } cupsd_job_t; + + Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v retrieving revision 1.318 retrieving revision 1.319 diff -u -r1.318 -r1.319 --- cups.spec 26 Feb 2007 18:44:46 -0000 1.318 +++ cups.spec 2 Mar 2007 14:58:40 -0000 1.319 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -436,6 +436,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Fri Mar 2 2007 Tim Waugh 1:1.2.8-3 +- Updated LSPP patch (bug #229673). + * Mon Feb 26 2007 Tim Waugh 1:1.2.8-2 - Applied fix for STR #2264 (bug #230116). From fedora-cvs-commits at redhat.com Fri Mar 2 15:06:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 10:06:37 -0500 Subject: rpms/nautilus/devel nautilus-xdg-user-dirs.patch, NONE, 1.1 nautilus.spec, 1.143, 1.144 Message-ID: <200703021506.l22F6bej011683@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11562/devel Modified Files: nautilus.spec Added Files: nautilus-xdg-user-dirs.patch Log Message: * Thu Mar 1 2007 Alexander Larsson - 2.17.92-2 - Add xdg-user-dirs patch nautilus-xdg-user-dirs.patch: libnautilus-private/nautilus-file-utilities.c | 283 +++++++++++++++++++++++++- libnautilus-private/nautilus-file-utilities.h | 2 libnautilus-private/nautilus-signaller.c | 9 src/file-manager/fm-directory-view.c | 103 ++++++--- 4 files changed, 366 insertions(+), 31 deletions(-) --- NEW FILE nautilus-xdg-user-dirs.patch --- Index: src/file-manager/fm-directory-view.c =================================================================== --- src/file-manager/fm-directory-view.c (revision 12767) +++ src/file-manager/fm-directory-view.c (working copy) @@ -151,6 +151,7 @@ #define FM_DIRECTORY_VIEW_POPUP_PATH_LOCATION "/location" #define MAX_MENU_LEVELS 5 +#define TEMPLATE_LIMIT 30 enum { ADD_FILE, @@ -187,9 +188,6 @@ static gboolean confirm_trash_auto_value static char *scripts_directory_uri; static int scripts_directory_uri_length; -static char *templates_directory_uri; -static int templates_directory_uri_length; - struct FMDirectoryViewDetails { NautilusWindowInfo *window; @@ -389,6 +387,8 @@ static gboolean activate_check_mime_type NautilusFile *file, gboolean warn_on_mismatch); static GdkDragAction ask_link_action (FMDirectoryView *view); +static void update_templates_directory (FMDirectoryView *view); +static void user_dirs_changed (FMDirectoryView *view); static void file_get_volume_and_drive (NautilusFile *file, GnomeVFSVolume **volume, @@ -1619,17 +1619,6 @@ set_up_scripts_directory_global (void) } static void -set_up_templates_directory_global (void) -{ - if (templates_directory_uri != NULL) { - return; - } - - templates_directory_uri = nautilus_get_templates_directory_uri (); - templates_directory_uri_length = strlen (templates_directory_uri); -} - -static void create_scripts_directory (void) { char *gnome1_path, *gnome1_uri_str; @@ -1912,6 +1901,7 @@ fm_directory_view_init (FMDirectoryView static gboolean setup_autos = FALSE; NautilusDirectory *scripts_directory; NautilusDirectory *templates_directory; + char *templates_uri; if (!setup_autos) { setup_autos = TRUE; @@ -1940,10 +1930,18 @@ fm_directory_view_init (FMDirectoryView add_directory_to_scripts_directory_list (view, scripts_directory); nautilus_directory_unref (scripts_directory); - set_up_templates_directory_global (); - templates_directory = nautilus_directory_get (templates_directory_uri); - add_directory_to_templates_directory_list (view, templates_directory); - nautilus_directory_unref (templates_directory); + if (nautilus_should_use_templates_directory ()) { + templates_uri = nautilus_get_templates_directory_uri (); + templates_directory = nautilus_directory_get (templates_uri); + g_free (templates_uri); + add_directory_to_templates_directory_list (view, templates_directory); + nautilus_directory_unref (templates_directory); + } + update_templates_directory (view); + g_signal_connect_object (nautilus_signaller_get_current (), + "user_dirs_changed", + G_CALLBACK (user_dirs_changed), + view, G_CONNECT_SWAPPED); view->details->sort_directories_first = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); @@ -5712,19 +5710,52 @@ add_template_to_templates_menus (FMDirec g_free (action_name); } +static void +update_templates_directory (FMDirectoryView *view) +{ + NautilusDirectory *templates_directory; + GList *node, *next; + char *templates_uri; + + for (node = view->details->templates_directory_list; node != NULL; node = next) { + next = node->next; + remove_directory_from_templates_directory_list (view, node->data); + } + + if (nautilus_should_use_templates_directory ()) { + templates_uri = nautilus_get_templates_directory_uri (); + templates_directory = nautilus_directory_get (templates_uri); + g_free (templates_uri); + add_directory_to_templates_directory_list (view, templates_directory); + nautilus_directory_unref (templates_directory); + } +} + +static void +user_dirs_changed (FMDirectoryView *view) +{ + update_templates_directory (view); + view->details->templates_invalid = TRUE; + schedule_update_menus (view); +} static gboolean -directory_belongs_in_templates_menu (const char *uri) +directory_belongs_in_templates_menu (const char *templates_directory_uri, + const char *uri) { int num_levels; int i; - if (!eel_str_has_prefix (uri, templates_directory_uri)) { + if (templates_directory_uri == NULL) { + return FALSE; + } + + if (!g_str_has_prefix (uri, templates_directory_uri)) { return FALSE; } num_levels = 0; - for (i = templates_directory_uri_length; uri[i] != '\0'; i++) { + for (i = strlen (templates_directory_uri); uri[i] != '\0'; i++) { if (uri[i] == '/') { num_levels++; } @@ -5738,7 +5769,9 @@ directory_belongs_in_templates_menu (con } static gboolean -update_directory_in_templates_menu (FMDirectoryView *view, NautilusDirectory *directory) +update_directory_in_templates_menu (FMDirectoryView *view, + const char *templates_directory_uri, + NautilusDirectory *directory) { char *menu_path, *popup_bg_path; GList *file_list, *filtered, *node; @@ -5747,9 +5780,13 @@ update_directory_in_templates_menu (FMDi NautilusDirectory *dir; char *escaped_path; char *uri; + int num; + + /* We know this directory belongs to the template dir, so it must exist */ + g_assert (templates_directory_uri); uri = nautilus_directory_get_uri (directory); - escaped_path = escape_action_path (uri + templates_directory_uri_length); + escaped_path = escape_action_path (uri + strlen (templates_directory_uri)); g_free (uri); menu_path = g_strconcat (FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_PLACEHOLDER, escaped_path, @@ -5765,13 +5802,14 @@ update_directory_in_templates_menu (FMDi file_list = nautilus_file_list_sort_by_display_name (filtered); + num = 0; any_templates = FALSE; - for (node = file_list; node != NULL; node = node->next) { + for (node = file_list; num < TEMPLATE_LIMIT && node != NULL; node = node->next, num++) { file = node->data; if (nautilus_file_is_directory (file)) { uri = nautilus_file_get_uri (file); - if (directory_belongs_in_templates_menu (uri)) { + if (directory_belongs_in_templates_menu (templates_directory_uri, uri)) { dir = nautilus_directory_get (uri); add_directory_to_templates_directory_list (view, dir); nautilus_directory_unref (dir); @@ -5809,6 +5847,13 @@ update_templates_menu (FMDirectoryView * GtkUIManager *ui_manager; char *uri; GtkAction *action; + char *templates_directory_uri; + + if (nautilus_should_use_templates_directory ()) { + templates_directory_uri = nautilus_get_templates_directory_uri (); + } else { + templates_directory_uri = NULL; + } /* There is a race condition here. If we don't mark the scripts menu as valid before we begin our task then we can lose template menu updates that @@ -5833,9 +5878,11 @@ update_templates_menu (FMDirectoryView * directory = node->data; uri = nautilus_directory_get_uri (directory); - if (!directory_belongs_in_templates_menu (uri)) { + if (!directory_belongs_in_templates_menu (templates_directory_uri, uri)) { remove_directory_from_templates_directory_list (view, directory); - } else if (update_directory_in_templates_menu (view, directory)) { + } else if (update_directory_in_templates_menu (view, + templates_directory_uri, + directory)) { any_templates = TRUE; } g_free (uri); @@ -5844,6 +5891,8 @@ update_templates_menu (FMDirectoryView * action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_NO_TEMPLATES); gtk_action_set_visible (action, !any_templates); + + g_free (templates_directory_uri); } Index: libnautilus-private/nautilus-file-utilities.c =================================================================== --- libnautilus-private/nautilus-file-utilities.c (revision 12767) +++ libnautilus-private/nautilus-file-utilities.c (working copy) @@ -31,6 +31,7 @@ #include "nautilus-metafile.h" #include "nautilus-file.h" #include "nautilus-search-directory.h" +#include "nautilus-signaller.h" #include #include #include @@ -49,6 +50,7 @@ #define LEGACY_DESKTOP_DIRECTORY_NAME ".gnome-desktop" #define DEFAULT_DESKTOP_DIRECTORY_MODE (0755) +static void update_xdg_dir_cache (void); char * nautilus_compute_title_for_uri (const char *text_uri) @@ -148,15 +150,277 @@ nautilus_get_user_directory (void) return user_directory; } +typedef struct { + char *type; + char *path; + NautilusFile *file; +} XdgDirEntry; + + +static XdgDirEntry * +parse_xdg_dirs (const char *config_file) +{ + GArray *array; + char *config_file_free = NULL; + XdgDirEntry dir; + char *data; + char **lines; + char *p, *d; + int i; + char *type_start, *type_end; + char *value, *unescaped; + gboolean relative; + + array = g_array_new (TRUE, TRUE, sizeof (XdgDirEntry)); + + if (config_file == NULL) + { + config_file_free = g_build_filename (g_get_user_config_dir (), + "user-dirs.dirs", NULL); + config_file = (const char *)config_file_free; + } + + if (g_file_get_contents (config_file, &data, NULL, NULL)) + { + lines = g_strsplit (data, "\n", 0); + g_free (data); + for (i = 0; lines[i] != NULL; i++) + { + p = lines[i]; + while (g_ascii_isspace (*p)) + p++; + + if (*p == '#') + continue; + + value = strchr (p, '='); + if (value == NULL) + continue; + *value++ = 0; + + g_strchug (g_strchomp (p)); + if (!g_str_has_prefix (p, "XDG_")) + continue; + if (!g_str_has_suffix (p, "_DIR")) + continue; + type_start = p + 4; + type_end = p + strlen (p) - 4; + + while (g_ascii_isspace (*value)) + value++; + + if (*value != '"') + continue; + value++; + + relative = FALSE; + if (g_str_has_prefix (value, "$HOME")) + { + relative = TRUE; + value += 5; + while (*value == '/') + value++; + } + else if (*value != '/') + continue; + + d = unescaped = g_malloc (strlen (value) + 1); + while (*value && *value != '"') + { + if ((*value == '\\') && (*(value + 1) != 0)) + value++; + *d++ = *value++; + } + *d = 0; + + *type_end = 0; + dir.type = g_strdup (type_start); + if (relative) + { + dir.path = g_build_filename (g_get_home_dir (), unescaped, NULL); + g_free (unescaped); + } + else + dir.path = unescaped; + + g_array_append_val (array, dir); + } + + g_strfreev (lines); + } + + g_free (config_file_free); + + return (XdgDirEntry *)g_array_free (array, FALSE); +} + +static XdgDirEntry *cached_xdg_dirs = NULL; +static GnomeVFSMonitorHandle *cached_xdg_dirs_handle = NULL; + +static void +xdg_dir_changed (NautilusFile *file, + XdgDirEntry *dir) +{ + char *file_uri; + char *dir_uri; + char *path; + + file_uri = nautilus_file_get_uri (file); + dir_uri = gnome_vfs_get_uri_from_local_path (dir->path); + if (file_uri && dir_uri && + !gnome_vfs_uris_match (dir_uri, file_uri)) { + path = gnome_vfs_get_local_path_from_uri (file_uri); + + if (path) { + char *argv[5]; + int i; + + g_free (dir->path); + dir->path = path; + + i = 0; + argv[i++] = "xdg-user-dirs-update"; + argv[i++] = "--set"; + argv[i++] = dir->type; + argv[i++] = dir->path; + argv[i++] = NULL; + + /* We do this sync, to avoid possible race-conditions + if multiple dirs change at the same time. Its + blocking the main thread, but these updates should + be very rare and very fast. */ + g_spawn_sync (NULL, + argv, NULL, + G_SPAWN_SEARCH_PATH | + G_SPAWN_STDOUT_TO_DEV_NULL | + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, + NULL, NULL, NULL, NULL); + } + } + g_free (file_uri); + g_free (dir_uri); +} + +static void +xdg_dir_cache_changed_cb (GnomeVFSMonitorHandle *handle, + const gchar *monitor_uri, + const gchar *info_uri, + GnomeVFSMonitorEventType event_type, + gpointer user_data) +{ + if (event_type == GNOME_VFS_MONITOR_EVENT_CHANGED || + event_type == GNOME_VFS_MONITOR_EVENT_CREATED) { + update_xdg_dir_cache (); + } +} + +static int user_dirs_changed_tag = 0; + +static gboolean +emit_user_dirs_changed_idle (gpointer data) +{ + g_signal_emit_by_name (nautilus_signaller_get_current (), + "user_dirs_changed"); + user_dirs_changed_tag = 0; + return FALSE; +} + +static void +schedule_user_dirs_changed (void) +{ + if (user_dirs_changed_tag == 0) { + user_dirs_changed_tag = g_idle_add (emit_user_dirs_changed_idle, NULL); + } +} + +static void +update_xdg_dir_cache (void) +{ + static gboolean started_monitor = FALSE; + char *config_file, *uri; + int i; + + if (cached_xdg_dirs) { + for (i = 0 ; cached_xdg_dirs[i].type != NULL; i++) { + if (cached_xdg_dirs[i].file != NULL) { + nautilus_file_monitor_remove (cached_xdg_dirs[i].file, + &cached_xdg_dirs[i]); + g_signal_handlers_disconnect_by_func (cached_xdg_dirs[i].file, + G_CALLBACK (xdg_dir_changed), + &cached_xdg_dirs[i]); + nautilus_file_unref (cached_xdg_dirs[i].file); + } + g_free (cached_xdg_dirs[i].type); + g_free (cached_xdg_dirs[i].path); + } + g_free (cached_xdg_dirs); + + schedule_user_dirs_changed (); + } + + if (!started_monitor) { + config_file = g_build_filename (g_get_user_config_dir (), + "user-dirs.dirs", NULL); + uri = gnome_vfs_get_uri_from_local_path (config_file); + gnome_vfs_monitor_add (&cached_xdg_dirs_handle, + uri, + GNOME_VFS_MONITOR_FILE, + xdg_dir_cache_changed_cb, + NULL); + g_free (uri); + g_free (config_file); + } + + cached_xdg_dirs = parse_xdg_dirs (NULL); + + for (i = 0 ; cached_xdg_dirs[i].type != NULL; i++) { + cached_xdg_dirs[i].file = NULL; + if (strcmp (cached_xdg_dirs[i].path, g_get_home_dir ()) != 0) { + uri = gnome_vfs_get_uri_from_local_path (cached_xdg_dirs[i].path); + cached_xdg_dirs[i].file = nautilus_file_get (uri); + nautilus_file_monitor_add (cached_xdg_dirs[i].file, + &cached_xdg_dirs[i], + NAUTILUS_FILE_ATTRIBUTE_FILE_TYPE); + g_signal_connect (cached_xdg_dirs[i].file, + "changed", G_CALLBACK (xdg_dir_changed), &cached_xdg_dirs[i]); + g_free (uri); + } + } +} + +char * +nautilus_get_xdg_dir (const char *type) +{ + int i; + + if (cached_xdg_dirs == NULL) { + update_xdg_dir_cache (); + } + + for (i = 0 ; cached_xdg_dirs != NULL && cached_xdg_dirs[i].type != NULL; i++) { + if (strcmp (cached_xdg_dirs[i].type, type) == 0) { + return g_strdup (cached_xdg_dirs[i].path); + } + } + if (strcmp ("DESKTOP", type) == 0) { + return g_build_filename (g_get_home_dir (), DESKTOP_DIRECTORY_NAME, NULL); + } + if (strcmp ("TEMPLATES", type) == 0) { + return g_build_filename (g_get_home_dir (), "Templates", NULL); + } + + return g_strdup (g_get_home_dir ()); +} + static char * get_desktop_path (void) { if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR)) { return g_strdup (g_get_home_dir()); } else { - return g_build_filename (g_get_home_dir (), DESKTOP_DIRECTORY_NAME, NULL); + return nautilus_get_xdg_dir ("DESKTOP"); } - } /** @@ -231,11 +495,22 @@ nautilus_get_home_directory_uri (void) } +gboolean +nautilus_should_use_templates_directory (void) +{ + char *dir; + gboolean res; + + dir = nautilus_get_xdg_dir ("TEMPLATES"); + res = strcmp (dir, g_get_home_dir ()) != 0; + g_free (dir); + return res; +} + char * nautilus_get_templates_directory (void) { - return g_build_filename (g_get_home_dir(), - "Templates", NULL); + return nautilus_get_xdg_dir ("TEMPLATES"); } void Index: libnautilus-private/nautilus-file-utilities.h =================================================================== --- libnautilus-private/nautilus-file-utilities.h (revision 12767) +++ libnautilus-private/nautilus-file-utilities.h (working copy) @@ -37,6 +37,7 @@ gboolean nautilus_file_name_matches_back /* These functions all return something something that needs to be * freed with g_free, is not NULL, and is guaranteed to exist. */ +char * nautilus_get_xdg_dir (const char *type); char * nautilus_get_user_directory (void); char * nautilus_get_desktop_directory (void); char * nautilus_get_desktop_directory_uri (void); @@ -49,6 +50,7 @@ gboolean nautilus_is_home_directory_file char * nautilus_get_gmc_desktop_directory (void); char * nautilus_get_pixmap_directory (void); +gboolean nautilus_should_use_templates_directory (void); char * nautilus_get_templates_directory (void); char * nautilus_get_templates_directory_uri (void); void nautilus_create_templates_directory (void); Index: libnautilus-private/nautilus-signaller.c =================================================================== --- libnautilus-private/nautilus-signaller.c (revision 12767) +++ libnautilus-private/nautilus-signaller.c (working copy) @@ -39,6 +39,7 @@ enum { HISTORY_LIST_CHANGED, EMBLEMS_CHANGED, POPUP_MENU_CHANGED, + USER_DIRS_CHANGED, LAST_SIGNAL }; @@ -94,4 +95,12 @@ nautilus_signaller_class_init (NautilusS NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + signals[USER_DIRS_CHANGED] = + g_signal_new ("user_dirs_changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- nautilus.spec 28 Feb 2007 02:18:14 -0000 1.143 +++ nautilus.spec 2 Mar 2007 15:06:35 -0000 1.144 @@ -19,7 +19,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME Version: 2.17.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2 @@ -80,6 +80,8 @@ Patch5: nautilus-2.17.90-selinux.patch Patch6: nautilus-2.16.2-dynamic-search.patch +Patch7: nautilus-xdg-user-dirs.patch + %description Nautilus integrates access to files, applications, media, Internet-based resources and the Web. Nautilus delivers a dynamic and @@ -112,6 +114,7 @@ %patch3 -p1 -b .no-delay %patch5 -p1 -b .selinux %patch6 -p1 -b .dynamic-search +%patch7 -p0 -b .xdg-user-dirs %build @@ -207,6 +210,9 @@ %{_libdir}/*.so %changelog +* Thu Mar 1 2007 Alexander Larsson - 2.17.92-2 +- Add xdg-user-dirs patch + * Tue Feb 27 2007 Matthias Clasen - 2.17.92-1 - Update to 2.17.92 From fedora-cvs-commits at redhat.com Fri Mar 2 15:33:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 10:33:56 -0500 Subject: rpms/vnc/devel vnc-autotools.patch, 1.1, 1.2 vnc-modular-xorg.patch, 1.11, 1.12 vnc-ppc64.patch, 1.3, 1.4 vnc-render.patch, 1.18, 1.19 vnc-s390.patch, 1.2, 1.3 vnc.spec, 1.168, 1.169 vnc-fontpath.patch, 1.3, NONE vnc-mesa-6.5.2.patch, 1.6, NONE vnc-mesa.patch, 1.1, NONE vnc-null-interface.patch, 1.2, NONE vnc-render-sigfault.patch, 1.1, NONE vnc-selinux.patch, 1.1, NONE Message-ID: <200703021533.l22FXuho025042@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/vnc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24867/vnc/devel Modified Files: vnc-autotools.patch vnc-modular-xorg.patch vnc-ppc64.patch vnc-render.patch vnc-s390.patch vnc.spec Removed Files: vnc-fontpath.patch vnc-mesa-6.5.2.patch vnc-mesa.patch vnc-null-interface.patch vnc-render-sigfault.patch vnc-selinux.patch Log Message: many changes, see changelog vnc-autotools.patch: common/Makefile.am | 5 common/Xregion/Makefile.am | 6 + common/configure.ac | 42 +++++++ common/network/Makefile.am | 6 + common/rdr/Makefile.am | 30 +++++ common/rfb/Makefile.am | 136 +++++++++++++++++++++++++ unix/Makefile.am | 6 + unix/configure.ac | 52 +++++++++ unix/tx/Makefile.am | 25 ++++ unix/vncconfig/Makefile.am | 17 +++ unix/vncpasswd/Makefile.am | 10 + unix/vncviewer/Makefile.am | 24 ++++ unix/x0vncserver/Makefile.am | 20 +++ unix/xorg-x11-server-source/hw/vnc/Makefile.am | 10 - 14 files changed, 381 insertions(+), 8 deletions(-) Index: vnc-autotools.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-autotools.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vnc-autotools.patch 16 Feb 2007 15:32:59 -0000 1.1 +++ vnc-autotools.patch 2 Mar 2007 15:33:54 -0000 1.2 @@ -366,8 +366,8 @@ + vncviewer/Makefile + x0vncserver/Makefile]) +AC_OUTPUT ---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/vnc/Makefile.am.autotools 2007-02-16 09:52:43.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/vnc/Makefile.am 2007-02-16 09:53:24.000000000 +0100 +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.autotools 2007-02-16 09:52:43.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am 2007-02-16 09:53:24.000000000 +0100 @@ -42,10 +42,7 @@ ../xfree86/common/libcommon.la \ -lX11 \ vnc-modular-xorg.patch: xc/programs/Xserver/vnc/Xvnc/xvnc.cc | 9 --- xorg-x11-server-source/configure.ac | 1 xorg-x11-server-source/hw/Makefile.am | 3 + xorg-x11-server-source/hw/vnc/Makefile.am | 85 ++++++++++++++++++++++++++++++ xorg-x11-server-source/mi/miinitext.c | 6 ++ 5 files changed, 97 insertions(+), 7 deletions(-) Index: vnc-modular-xorg.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-modular-xorg.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vnc-modular-xorg.patch 15 Nov 2006 11:24:16 -0000 1.11 +++ vnc-modular-xorg.patch 2 Mar 2007 15:33:54 -0000 1.12 @@ -1,46 +1,46 @@ ---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2006-06-13 17:47:02.000000000 -0400 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2006-06-13 17:47:02.000000000 -0400 -@@ -36,8 +36,6 @@ - extern "C" { - #define class c_class - #define public c_public --#define xor c_xor --#define and c_and - #ifdef WIN32 - #include +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.modular-xorg 2007-03-02 15:45:37.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c 2007-03-02 15:45:38.000000000 +0100 +@@ -283,6 +283,9 @@ + #ifdef MITMISC + extern void MITMiscExtensionInit(INITARGS); #endif -@@ -72,11 +70,8 @@ - #include "inputstr.h" - #include "keysym.h" - extern int defaultColorVisualClass; -- extern char buildtime[]; - #undef class - #undef public --#undef xor --#undef and - #ifndef VNC_USE_FB - extern Bool cfb16ScreenInit(ScreenPtr, pointer, int, int, int, int, int); - extern Bool cfb32ScreenInit(ScreenPtr, pointer, int, int, int, int, int); -@@ -221,7 +216,7 @@ ++#ifdef VNCEXT ++extern void vncExtensionInit(INITARGS); ++#endif + #ifdef XIDLE + extern void XIdleExtensionInit(INITARGS); + #endif +@@ -561,6 +564,9 @@ + #ifdef MITMISC + if (!noMITMiscExtension) MITMiscExtensionInit(); + #endif ++#ifdef VNCEXT ++ vncExtensionInit(); ++#endif + #ifdef XIDLE + if (!noXIdleExtension) XIdleExtensionInit(); + #endif +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.modular-xorg 2007-03-02 15:45:38.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am 2007-03-02 15:47:10.000000000 +0100 +@@ -30,6 +30,8 @@ + XPRINT_SUBDIRS = xprint + endif - void ddxUseMsg() - { -- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); -+ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); - ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, - VENDOR_STRING); - ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); -@@ -927,7 +922,7 @@ ++XVNC_SUBDIRS = vnc ++ + # need to add darwin support here - void InitOutput(ScreenInfo *screenInfo, int argc, char **argv) - { -- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); -+ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); - ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, - VENDOR_STRING); - wellKnownSocketsCreated = true; ---- /dev/null 2006-06-13 10:12:45.634275750 -0400 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/vnc/Makefile.am 2006-06-13 17:47:02.000000000 -0400 + SUBDIRS = \ +@@ -39,6 +41,7 @@ + $(XVFB_SUBDIRS) \ + $(XNEST_SUBDIRS) \ + $(DMX_SUBDIRS) \ ++ $(XVNC_SUBDIRS) \ + $(KDRIVE_SUBDIRS) \ + $(XPRINT_SUBDIRS) + +--- /dev/null 2007-03-01 10:25:08.783929433 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am 2007-03-02 15:45:38.000000000 +0100 @@ -0,0 +1,85 @@ +noinst_LTLIBRARIES = libvnccommon.la +libvnccommon_la_SOURCES = \ @@ -127,28 +127,9 @@ + -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" + ---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/Makefile.am.modular-xorg 2006-01-09 21:30:56.000000000 -0500 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/Makefile.am 2006-06-13 17:47:51.000000000 -0400 -@@ -26,6 +26,8 @@ - KDRIVE_SUBDIRS = kdrive - endif - -+XVNC_SUBDIRS = vnc -+ - # need to add darwin support here - - SUBDIRS = \ -@@ -35,6 +37,7 @@ - $(XVFB_SUBDIRS) \ - $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ -+ $(XVNC_SUBDIRS) \ - $(KDRIVE_SUBDIRS) - - DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl ---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/configure.ac.modular-xorg 2006-05-22 13:18:49.000000000 -0400 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/configure.ac 2006-06-13 17:48:11.000000000 -0400 -@@ -1720,6 +1720,7 @@ +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.modular-xorg 2007-03-02 15:45:38.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac 2007-03-02 15:45:38.000000000 +0100 +@@ -1793,6 +1793,7 @@ hw/xnest/Makefile hw/xwin/Makefile hw/darwin/Makefile @@ -156,47 +137,44 @@ hw/kdrive/Makefile hw/kdrive/ati/Makefile hw/kdrive/chips/Makefile ---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/mi/miinitext.c.modular-xorg 2006-03-11 19:11:34.000000000 -0500 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/mi/miinitext.c 2006-06-13 17:47:02.000000000 -0400 -@@ -297,6 +297,9 @@ - #ifdef MITMISC - extern void MITMiscExtensionInit(INITARGS); - #endif -+#ifdef VNCEXT -+extern void vncExtensionInit(INITARGS); -+#endif - #ifdef XIDLE - extern void XIdleExtensionInit(INITARGS); - #endif -@@ -577,6 +580,9 @@ - #ifdef MITMISC - if (!noMITMiscExtension) MITMiscExtensionInit(); - #endif -+#ifdef VNCEXT -+ vncExtensionInit(); -+#endif - #ifdef XIDLE - if (!noXIdleExtension) XIdleExtensionInit(); +--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2007-03-02 15:45:38.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-02 15:45:38.000000000 +0100 +@@ -36,8 +36,6 @@ + extern "C" { + #define class c_class + #define public c_public +-#define xor c_xor +-#define and c_and + #ifdef WIN32 + #include #endif ---- vnc-4_1_2-unixsrc/unix/vncinstall.modular-xorg 2005-02-28 08:00:32.000000000 -0500 -+++ vnc-4_1_2-unixsrc/unix/vncinstall 2006-06-13 17:47:02.000000000 -0400 -@@ -56,7 +56,7 @@ - fi - fi - --for f in xc/programs/Xserver/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \ -+for f in xorg-server-*/hw/vnc/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \ - vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do - if [ ! -f $f ]; then - echo "Couldn't find $f" -@@ -85,8 +85,8 @@ +@@ -72,11 +70,8 @@ + #include "inputstr.h" + #include "keysym.h" + extern int defaultColorVisualClass; +- extern char buildtime[]; + #undef class + #undef public +-#undef xor +-#undef and + #ifndef VNC_USE_FB + extern Bool cfb16ScreenInit(ScreenPtr, pointer, int, int, int, int, int); + extern Bool cfb32ScreenInit(ScreenPtr, pointer, int, int, int, int, int); +@@ -221,7 +216,7 @@ - done + void ddxUseMsg() + { +- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); ++ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); + ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, + VENDOR_STRING); + ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); +@@ -927,7 +922,7 @@ --vncModule=xc/programs/Xserver/vnc/module/vnc.so --if [ -f "$vncModule" -a -d "$moduledst" ]; then -+vncModule=xorg-server-*/hw/vnc/.libs/libvnc.so -+if [ -f $vncModule -a -d "$moduledst" ]; then - if cmp -s $vncModule $moduledst/`basename $vncModule`; then - echo "`basename $vncModule` hasn't changed" - else + void InitOutput(ScreenInfo *screenInfo, int argc, char **argv) + { +- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); ++ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); + ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, + VENDOR_STRING); + wellKnownSocketsCreated = true; vnc-ppc64.patch: compiler.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: vnc-ppc64.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-ppc64.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vnc-ppc64.patch 15 Nov 2006 11:24:16 -0000 1.3 +++ vnc-ppc64.patch 2 Mar 2007 15:33:54 -0000 1.4 @@ -1,5 +1,5 @@ ---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/xfree86/common/compiler.h.ppc64 2006-11-14 16:10:58.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/xfree86/common/compiler.h 2006-11-14 16:14:11.000000000 +0100 +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h.ppc64 2006-11-14 16:10:58.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h 2006-11-14 16:14:11.000000000 +0100 @@ -1081,7 +1081,7 @@ #if defined(linux) && defined(__powerpc64__) # include vnc-render.patch: Xvnc/xvnc.cc | 39 ++++++++++++++++++++++++++++++++++++++- vncHooks.cc | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 1 deletion(-) Index: vnc-render.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-render.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- vnc-render.patch 8 Jan 2007 12:51:02 -0000 1.18 +++ vnc-render.patch 2 Mar 2007 15:33:54 -0000 1.19 @@ -1,120 +1,11 @@ ---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.render 2006-12-05 12:01:54.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2006-12-05 15:41:20.000000000 +0100 -@@ -130,6 +130,13 @@ - static Bool vfbPixmapDepths[33]; - static char needswap = 0; - static int lastScreen = -1; -+#ifdef RENDER -+#if (defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)) -+static Bool Render = TRUE; -+#else -+static Bool Render = FALSE; -+#endif -+#endif - - static bool displaySpecified = false; - static bool wellKnownSocketsCreated = false; -@@ -221,6 +228,15 @@ - VENDOR_STRING); - 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__)) -+ ErrorF("+/-render turn on/off RENDER extension support" -+ "(default on)\n"); -+#else -+ ErrorF("+/-render turn on/off RENDER extension support" -+ "(default off)\n"); -+#endif -+#endif - ErrorF("-linebias n adjust thin line pixelization\n"); - ErrorF("-blackpixel n pixel value for black\n"); - ErrorF("-whitepixel n pixel value for white\n"); -@@ -317,6 +333,20 @@ - return ret; - } - -+#ifdef RENDER -+ if (strcmp (argv[i], "+render") == 0) /* +render */ -+ { -+ Render = TRUE; -+ return 1; -+ } -+ -+ if (strcmp (argv[i], "-render") == 0) /* -render */ -+ { -+ Render = FALSE; -+ return 1; -+ } -+#endif -+ - if (strcmp (argv[i], "-blackpixel") == 0) /* -blackpixel n */ - { - Pixel pix; -@@ -817,7 +847,12 @@ - if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, - dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel)) - return FALSE; --#else -+ -+#ifdef RENDER -+ if (ret && Render) -+ fbPictureInit(pScreen, 0, 0); -+#endif /* RENDER */ -+#else /* VNC_USE_FB */ - switch (pvfb->bitsPerPixel) - { - case 1: -@@ -938,6 +973,19 @@ - vfbPixmapDepths[vfbScreens[i].depth] = TRUE; - } - -+#ifdef RENDER -+ /* RENDER needs a good set of pixmaps. */ -+ if (Render) { -+ vfbPixmapDepths[1] = TRUE; -+ vfbPixmapDepths[4] = TRUE; -+ vfbPixmapDepths[8] = TRUE; -+/* vfbPixmapDepths[15] = TRUE; */ -+ vfbPixmapDepths[16] = TRUE; -+ vfbPixmapDepths[24] = TRUE; -+ vfbPixmapDepths[32] = TRUE; -+ } -+#endif -+ - for (i = 1; i <= 32; i++) - { - if (vfbPixmapDepths[i]) ---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile.render 2006-12-05 12:01:54.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile 2006-12-05 12:01:54.000000000 +0100 -@@ -19,7 +19,7 @@ - SRCS = vncExtInit.cc vncHooks.cc XserverDesktop.cc - OBJS = vncExtInit.o vncHooks.o XserverDesktop.o - INCLUDES = -I../include -I$(EXTINCSRC) -I$(XINCLUDESRC) -I$(FONTINCSRC) \ -- -I../mfb -I../mi $(VNCINCLUDE) -+ -I../render $(VNCINCLUDE) - #if defined(XFree86Version) && XFree86Version >= 4000 - VNCDEFINES = -DGC_HAS_COMPOSITE_CLIP - #endif ---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile.render 2006-12-05 12:01:54.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile 2006-12-05 12:01:54.000000000 +0100 -@@ -13,7 +13,7 @@ - OBJS = vncExtInit.o vncHooks.o xf86vncModule.o XserverDesktop.o - INCLUDES = -I.. -I../../include -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) -I$(XF86COMSRC) \ -- $(VNCINCLUDE) -+ -I../../render $(VNCINCLUDE) - DEFINES = $(STD_DEFINES) -DGC_HAS_COMPOSITE_CLIP -DXFree86LOADER - - LinkSourceFile(vncExtInit.cc,..) --- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc.render 2006-05-15 18:56:20.000000000 +0200 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc 2006-12-05 12:01:54.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc 2007-03-02 15:56:06.000000000 +0100 @@ -29,6 +29,9 @@ #include "regionstr.h" #include "dixfontstr.h" #include "colormapst.h" +#ifdef RENDER -+#include "../../../xorg-server-1.1.1/render/picturestr.h" ++#include "../../render/picturestr.h" +#endif #ifdef GC_HAS_COMPOSITE_CLIP @@ -208,3 +99,79 @@ ///////////////////////////////////////////////////////////////////////////// +--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.render 2007-03-02 15:56:06.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-02 15:56:37.000000000 +0100 +@@ -130,6 +130,7 @@ + static Bool vfbPixmapDepths[33]; + static char needswap = 0; + static int lastScreen = -1; ++static Bool Render = TRUE; + + static bool displaySpecified = false; + static bool wellKnownSocketsCreated = false; +@@ -221,6 +222,10 @@ + VENDOR_STRING); + ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); + ErrorF("-pixdepths list-of-int support given pixmap depths\n"); ++#ifdef RENDER ++ ErrorF("+/-render turn on/off RENDER extension support" ++ "(default on)\n"); ++#endif + ErrorF("-linebias n adjust thin line pixelization\n"); + ErrorF("-blackpixel n pixel value for black\n"); + ErrorF("-whitepixel n pixel value for white\n"); +@@ -317,6 +322,20 @@ + return ret; + } + ++#ifdef RENDER ++ if (strcmp (argv[i], "+render") == 0) /* +render */ ++ { ++ Render = TRUE; ++ return 1; ++ } ++ ++ if (strcmp (argv[i], "-render") == 0) /* -render */ ++ { ++ Render = FALSE; ++ return 1; ++ } ++#endif ++ + if (strcmp (argv[i], "-blackpixel") == 0) /* -blackpixel n */ + { + Pixel pix; +@@ -817,7 +836,12 @@ + if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, + dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel)) + return FALSE; +-#else ++ ++#ifdef RENDER ++ if (ret && Render) ++ fbPictureInit(pScreen, 0, 0); ++#endif /* RENDER */ ++#else /* VNC_USE_FB */ + switch (pvfb->bitsPerPixel) + { + case 1: +@@ -938,6 +962,19 @@ + vfbPixmapDepths[vfbScreens[i].depth] = TRUE; + } + ++#ifdef RENDER ++ /* RENDER needs a good set of pixmaps. */ ++ if (Render) { ++ vfbPixmapDepths[1] = TRUE; ++ vfbPixmapDepths[4] = TRUE; ++ vfbPixmapDepths[8] = TRUE; ++/* vfbPixmapDepths[15] = TRUE; */ ++ vfbPixmapDepths[16] = TRUE; ++ vfbPixmapDepths[24] = TRUE; ++ vfbPixmapDepths[32] = TRUE; ++ } ++#endif ++ + for (i = 1; i <= 32; i++) + { + if (vfbPixmapDepths[i]) vnc-s390.patch: common/compiler.h | 9 +++++++++ common/xf86Helper.c | 2 ++ int10/Makefile.am | 3 ++- os-support/linux/lnx_video.c | 5 +++-- os-support/misc/SlowBcopy.c | 4 +++- 5 files changed, 19 insertions(+), 4 deletions(-) Index: vnc-s390.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-s390.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vnc-s390.patch 21 Dec 2005 15:54:34 -0000 1.2 +++ vnc-s390.patch 2 Mar 2007 15:33:54 -0000 1.3 @@ -1,85 +1,75 @@ ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/linux/lnx_video.c.s390 2005-09-19 19:38:26.000000000 +0100 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/linux/lnx_video.c 2005-12-21 12:29:17.000000000 +0000 -@@ -64,7 +64,9 @@ +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/int10/Makefile.am.s390 2007-03-01 12:22:04.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/int10/Makefile.am 2007-03-01 12:34:20.000000000 +0100 +@@ -38,7 +38,8 @@ + endif + + if INT10_STUB +-AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) ++AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) \ ++ -I../common -I../os-support -I../os-support/bus + libint10_la_SOURCES = stub.c xf86int10module.c + endif + +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h.s390 2007-03-01 12:22:04.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h 2007-03-01 12:22:04.000000000 +0100 +@@ -1353,6 +1353,15 @@ + : "0" (_beg), "r" (_end), "r" (_flg)); \ + } while (0) + ++# elif defined(__s390__) || defined(__s390x__) ++ ++#define inb(x) (0) ++#define inw(x) (0) ++#define inl(x) (0) ++#define outb(x,y) (0) ++#define outw(x,y) (0) ++#define outl(x,y) (0) ++ + # else /* ix86 */ + + # define ldq_u(p) (*((unsigned long *)(p))) +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/xf86Helper.c.s390 2007-03-01 12:22:04.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/xf86Helper.c 2007-03-01 12:22:04.000000000 +0100 +@@ -2089,6 +2089,7 @@ + void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg, + int maskval, int knownclkindex, int knownclkvalue) + { ++#if !defined(__s390__) && !defined(__s390x__) + register int status = vertsyncreg; + unsigned long i, cnt, rcnt, sync; + +@@ -2182,6 +2183,7 @@ + + /* Restore registers that were written on */ + (*ClockFunc)(pScrn, CLK_REG_RESTORE); ++#endif /* !defined(__s390__) && !defined(__s390x__) */ + } + + _X_EXPORT void +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/linux/lnx_video.c.s390 2007-03-01 12:22:04.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/linux/lnx_video.c 2007-03-01 12:29:36.000000000 +0100 +@@ -62,7 +62,8 @@ #elif !defined(__powerpc__) && \ !defined(__mc68000__) && \ !defined(__sparc__) && \ - !defined(__mips__) + !defined(__mips__) && \ -+ !defined(__s390__) && \ -+ !defined(__s390x__) ++ !defined(__s390__) /* * Due to conflicts with "compiler.h", don't rely on to declare -@@ -569,7 +571,7 @@ +@@ -567,7 +568,7 @@ #endif } close(fd); -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__) ++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) if (ioperm(0, 1024, 1) || iopl(3)) { if (errno == ENODEV) ErrorF("xf86EnableIOPorts: no I/O ports found\n"); -@@ -596,7 +598,7 @@ - #if defined(__powerpc__) - munmap(ioBase, 0x20000); - ioBase = NULL; --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__) - iopl(0); - ioperm(0, 1024, 0); - #endif -@@ -615,12 +617,12 @@ - Bool - xf86DisableInterrupts() - { --#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) -+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__) - if (!ExtendedEnabled) - if (iopl(3) || ioperm(0, 1024, 1)) - return (FALSE); - #endif --#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) -+#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__) || defined(__s390x__) - #else - # ifdef __GNUC__ - # if defined(__ia64__) -@@ -634,7 +636,7 @@ - asm("cli"); - # endif - #endif --#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) -+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__) - if (!ExtendedEnabled) { - iopl(0); - ioperm(0, 1024, 0); -@@ -647,12 +649,12 @@ - void - xf86EnableInterrupts() - { --#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) -+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__) - if (!ExtendedEnabled) - if (iopl(3) || ioperm(0, 1024, 1)) - return; - #endif --#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) -+#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__) || defined(__s390x__) - #else - # ifdef __GNUC__ - # if defined(__ia64__) -@@ -666,7 +668,7 @@ - asm("sti"); - # endif - #endif --#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) -+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__) - if (!ExtendedEnabled) { - iopl(0); - ioperm(0, 1024, 0); ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/misc/SlowBcopy.c.s390 2005-07-03 08:01:34.000000000 +0100 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/misc/SlowBcopy.c 2005-12-21 12:29:17.000000000 +0000 -@@ -36,7 +36,9 @@ +--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/misc/SlowBcopy.c.s390 2007-03-01 12:22:04.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/misc/SlowBcopy.c 2007-03-01 12:22:04.000000000 +0100 +@@ -35,7 +35,9 @@ #if !defined(__sparc__) && \ !defined(__powerpc__) && \ !defined(__mips__) && \ @@ -90,62 +80,3 @@ outb(0x80, 0x00); #endif } ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/int10/Makefile.am.s390 2005-12-02 06:02:41.000000000 +0000 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/int10/Makefile.am 2005-12-21 12:29:46.000000000 +0000 -@@ -27,7 +27,8 @@ - endif - - if INT10_STUB --AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) -+AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) \ -+ -I../common -I../os-support -I../os-support/bus - libint10_la_SOURCES = stub.c xf86int10module.c - endif - ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Bus.c.s390 2005-07-03 09:53:42.000000000 +0100 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Bus.c 2005-12-21 12:29:17.000000000 +0000 -@@ -3078,7 +3078,7 @@ - CheckGenericGA() - { - /* This needs to be changed for multiple domains */ --#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) -+#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__s390__) && !defined(__s390x) - IOADDRESS GenericIOBase = VGAHW_GET_IOBASE(); - CARD8 CurrentValue, TestValue; - ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Helper.c.s390 2005-07-03 09:53:42.000000000 +0100 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Helper.c 2005-12-21 12:29:17.000000000 +0000 -@@ -2069,6 +2069,7 @@ - void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg, - int maskval, int knownclkindex, int knownclkvalue) - { -+#if !defined(__s390__) && !defined(__s390x__) - register int status = vertsyncreg; - unsigned long i, cnt, rcnt, sync; - -@@ -2162,6 +2163,7 @@ - - /* Restore registers that were written on */ - (*ClockFunc)(pScrn, CLK_REG_RESTORE); -+#endif /* !defined(__s390__) && !defined(__s390x__) */ - } - - void ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/compiler.h.s390 2005-11-08 06:33:28.000000000 +0000 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/compiler.h 2005-12-21 12:29:17.000000000 +0000 -@@ -1355,6 +1355,15 @@ - : "0" (_beg), "r" (_end), "r" (_flg)); \ - } while (0) - -+# elif defined(__s390__) || defined(__s390x__) -+ -+#define inb(x) (0) -+#define inw(x) (0) -+#define inl(x) (0) -+#define outb(x,y) (0) -+#define outw(x,y) (0) -+#define outl(x,y) (0) -+ - # else /* ix86 */ - - # define ldq_u(p) (*((unsigned long *)(p))) Index: vnc.spec =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- vnc.spec 26 Feb 2007 12:48:07 -0000 1.168 +++ vnc.spec 2 Mar 2007 15:33:54 -0000 1.169 @@ -1,20 +1,17 @@ -%define xorg_version 1.1.1 %define vnc_version 4_1_2 %define java_vnc_version 4_1 Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 13%{?dist} +Release: 14%{?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 -# This is from 'rpmbuild -bp xorg-x11.spec': -Source2: xorg-server-%{xorg_version}.tar.bz2 -Source3: vncserver.init -Source5: vnc-16x16.png -Source6: vnc-24x24.png -Source7: vnc-48x48.png +Source2: vncserver.init +Source3: vnc-16x16.png +Source4: vnc-24x24.png +Source5: vnc-48x48.png Patch0: vnc-cookie.patch Patch1: vnc-gcc4.patch Patch2: vnc-use-fb.patch @@ -25,23 +22,17 @@ Patch9: vnc-vncpasswd.patch Patch11: vnc-modular-xorg.patch Patch12: vnc-nohttpd.patch -Patch13: vnc-fontpath.patch Patch14: vnc-s390.patch Patch15: vnc-viewer-reparent.patch Patch16: vnc-64bit.patch Patch17: vnc-select.patch -#Patch18: vnc-null-interface.patch Patch19: vnc-ppc64.patch Patch21: vnc-newfbsize.patch Patch22: vnc-188169.patch Patch23: vnc-210617.patch Patch24: vnc-102434.patch Patch25: vnc-config.patch -Patch26: vnc-mesa.patch -Patch27: vnc-selinux.patch Patch28: vnc-render.patch -Patch29: vnc-mesa-6.5.2.patch -Patch30: vnc-render-sigfault.patch Patch31: vnc-autotools.patch Patch32: vnc-autotools-compile.patch Patch33: vnc-always_use_fb.patch @@ -57,18 +48,12 @@ BuildRequires: expat-devel, freetype-devel BuildRequires: libX11-devel, xorg-x11-xtrans-devel, libXau-devel BuildRequires: libXdmcp-devel, libxkbfile-devel, libXfont-devel -BuildRequires: xorg-x11-proto-devel, libXext-devel +BuildRequires: xorg-x11-proto-devel, libXext-devel, tcp_wrappers-devel BuildRequires: libXtst-devel, libfontenc-devel, xorg-x11-util-macros BuildRequires: libXt-devel BuildRequires: libstdc++-devel, gcc-c++, libselinux-devel - -%ifarch %{ix86} x86_64 ppc ia64 alpha sparc sparc64 -%define with_glx 1 +BuildRequires: xorg-x11-server-source BuildRequires: mesa-libGL-devel >= 6.5.2, mesa-source >= 6.5.2, libdrm-devel -%endif -%ifarch ppc64 s390 s390x -%define with_glx 0 -%endif Requires: gtk2 >= 2.6 Requires: coreutils @@ -102,9 +87,7 @@ %prep %setup -q -n vnc-%{vnc_version}-unixsrc -a1 -cd unix -tar -xkf %{SOURCE2} || : -cd .. +cp -r %{_datadir}/xorg-x11-server-source unix %patch0 -p1 -b .cookie %patch1 -p1 -b .gcc4 %patch2 -p1 -b .use-fb @@ -115,26 +98,19 @@ %patch9 -p1 -b .vncpasswd %patch11 -p1 -b .modular-xorg %patch12 -p1 -b .nohttpd -pushd unix/xorg-server-* -%patch13 -p3 -b .fontpath +pushd unix/xorg-x11-server-source* %patch14 -p3 -b .s390 popd %patch15 -p1 -b .viewer-reparent %patch16 -p1 -b .64bit %patch17 -p1 -b .select -#patch18 -p1 -b .null-interface %patch19 -p1 -b .ppc64 %patch21 -p1 -b .newfbsize %patch22 -p1 -b .fix %patch23 -p1 -b .ipv6 %patch24 -p1 -b .102434 %patch25 -p1 -b .config -#this two patches is for xorg-server 1.1.1 -%patch26 -p0 -b .mesa -%patch27 -p0 -b .selinux %patch28 -p1 -b .render -%patch29 -p1 -b .mesa-652 -%patch30 -p1 -b .render-sigfault %patch31 -p1 -b .autotools %patch32 -p1 -b .autotools-compile %patch33 -p1 -b .always_use_fb @@ -143,51 +119,49 @@ cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \ unix/xc/programs/Xserver/Xvnc.man \ unix/xc/programs/Xserver/vnc/*.{h,cc} \ - unix/xorg-server-*/hw/vnc/ -cp -a unix/xorg-server-*/{cfb/cfb.h,hw/vnc} -cp -a unix/xorg-server-*/{fb/fb.h,hw/vnc} -cp -a unix/xorg-server-*/{fb/fbrop.h,hw/vnc} + unix/xorg-x11-server-source/hw/vnc/ +cp -a unix/xorg-x11-server-source/{cfb/cfb.h,hw/vnc} +cp -a unix/xorg-x11-server-source/{fb/fb.h,hw/vnc} +cp -a unix/xorg-x11-server-source/{fb/fbrop.h,hw/vnc} sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \ - unix/xorg-server-*/hw/vnc/{cfb,fb,fbrop}.h + unix/xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h %build cd common autoreconf --install --force %configure -make +make %{?_smp_mflags} cd ../vnc-%{java_vnc_version}-javasrc/java -make JAVAC="gcj -C" JAR=fastjar +make JAVAC="gcj -C" JAR=fastjar %{?_smp_mflags} cd ../../unix autoreconf --install --force %configure -make +make %{?_smp_mflags} -cd xorg-server-* +cd xorg-x11-server-source aclocal; automake -a; autoconf -%configure --enable-xorg \ - --disable-xnest \ - --disable-xvfb \ - --disable-dmx \ - --disable-xwin \ - --disable-dependency-tracking \ +%configure --enable-xorg --disable-xnest --disable-xvfb \ + --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ + --with-pic \ + --disable-xorgcfg \ --disable-xprint \ --disable-static \ --enable-composite \ + --enable-xtrap \ + --enable-xcsecurity \ + --with-default-font-path="unix/:7100,built-ins" \ + --with-fontdir=%{_datadir}/X11/fonts \ --with-os-name="Fedora Core 7" \ --with-os-vendor="Red Hat, Inc." \ --with-xkb-output=%{_localstatedir}/lib/xkb \ --with-rgb-path=%{_datadir}/X11/rgb \ - --disable-xorgcfg \ - --disable-lbx \ - --enable-xdmcp \ + --enable-install-libxf86config \ --disable-xevie \ --disable-dri \ -%if %{with_glx} --enable-glx \ --with-mesa-source=%{_datadir}/mesa/source \ -%endif --with-int10=stub make %{?_smp_mflags} @@ -202,7 +176,7 @@ mandst=$RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $mandst -for f in xorg-server-%{xorg_version}/hw/vnc/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \ +for f in xorg-x11-server-source/hw/vnc/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \ vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do cp -pf $f.man $mandst/`basename $f.1` @@ -211,7 +185,7 @@ make install DESTDIR=$RPM_BUILD_ROOT cp vncserver $RPM_BUILD_ROOT/usr/bin -cd xorg-server-%{xorg_version}/hw/vnc +cd xorg-x11-server-source/hw/vnc make install DESTDIR=$RPM_BUILD_ROOT cd ../../../ @@ -219,7 +193,7 @@ cp -a ../vnc-%{java_vnc_version}-javasrc/java/{index.vnc,logo150x150.gif,vncviewer.jar} $RPM_BUILD_ROOT%{_datadir}/vnc/classes mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -install -m755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vncserver +install -m755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vncserver mkdir -p $RPM_BUILD_ROOT/etc/sysconfig cat > $RPM_BUILD_ROOT/etc/sysconfig/vncservers << "EOF" @@ -248,9 +222,9 @@ chmod 644 $RPM_BUILD_ROOT/etc/sysconfig/vncservers mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps -install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png -install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png -install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png +install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png +install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png +install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications cat > vncviewer.desktop << EOF [Desktop Entry] @@ -340,6 +314,18 @@ %{_libdir}/librfb.so.* %changelog +* Fri Mar 02 2007 Adam Tkac 4.1.2-14.fc7 +- enabled RENDER, Composite and GLX extensions by default on all architectures +- new relation between Xvnc and xorg's source. Xvnc now uses latest xorg's sources + from xorg-x11-server-source package +- fired away obsolete patches + - vnc-mesa-6.5.2.patch + - vnc-mesa.patch + - vnc-selinux.patch + - vnc-render-sigfault.patch + - vnc-fontpath.patch + - vnc-null-interface.patch + * Mon Feb 26 2007 Adam Tkac 4.1.2-13.fc7 - remove wild implementation of vsnprintf (this caused sigfaults on 64bits) (#229702) - added post & postun sections to vnc-libs --- vnc-fontpath.patch DELETED --- --- vnc-mesa-6.5.2.patch DELETED --- --- vnc-mesa.patch DELETED --- --- vnc-null-interface.patch DELETED --- --- vnc-render-sigfault.patch DELETED --- --- vnc-selinux.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 15:56:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 10:56:33 -0500 Subject: rpms/xen/devel xen-pvfb-terminate.patch, NONE, 1.1 xen.spec, 1.168, 1.169 Message-ID: <200703021556.l22FuXga015654@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15638 Modified Files: xen.spec Added Files: xen-pvfb-terminate.patch Log Message: Ensure PVFB terminates when guest doesn't startup xen-pvfb-terminate.patch: xenfb.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) --- NEW FILE xen-pvfb-terminate.patch --- --- a/tools/xenfb/xenfb.c 2007-02-27 18:39:54.000000000 +0100 +++ b/tools/xenfb/xenfb.c 2007-03-02 15:06:07.000000000 +0100 @@ -243,6 +243,8 @@ static int xenfb_wait_for_state(struct x unsigned state, dummy; char **vec; + awaited |= 1 << XenbusStateUnknown; + for (;;) { state = xenfb_read_state(xsh, dir); if (state < 0) @@ -317,6 +319,10 @@ static int xenfb_using_old_protocol(stru for (;;) { state = xenfb_read_state(xsh, xenfb->fb.otherend); + if (state == XenbusStateUnknown) { + ret = -1; + break; + } if (state > XenbusStateInitialising) { ret = 0; /* frontend talks xenbus protocol */ break; @@ -534,7 +540,7 @@ int xenfb_attach_dom(struct xenfb *xenfb { struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; struct xs_handle *xsh = xenfb->xsh; - int val, serrno; + int ret, val, serrno; struct xenfb_page *fb_page; xenfb_detach_dom(xenfb); @@ -564,8 +570,9 @@ int xenfb_attach_dom(struct xenfb *xenfb if (!xs_watch(xsh, xenfb->kbd.otherend, "")) goto error; - if (xenfb_using_old_protocol(xenfb)) - return 1; + ret = xenfb_using_old_protocol(xenfb); + if (ret) + return ret; if (xenfb_wait_for_frontend_initialised(&xenfb->fb) < 0) goto error; Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- xen.spec 2 Mar 2007 13:44:42 -0000 1.168 +++ xen.spec 2 Mar 2007 15:56:30 -0000 1.169 @@ -31,6 +31,7 @@ # from FC5/6 days. Can kill off once FC6 is EOL'd Patch150: xen-pvfb-compat.patch Patch151: xen-pvfb-compat-nohvm.patch +Patch152: xen-pvfb-terminate.patch Patch251: pygrub-manykernels.patch @@ -116,6 +117,7 @@ # pvfb compat %patch150 -p1 %patch151 -p0 +%patch152 -p1 # upstream patches %patch251 -p1 @@ -239,6 +241,7 @@ %changelog * Fri Mar 2 2007 Daniel Berrange - 3.0.4-7.fc7 - Fix interaction of bootloader with blktap (bz 230702) +- Ensure PFVB daemon terminates if domain doesn't startup (bz 230634) * Thu Feb 8 2007 Daniel Berrange - 3.0.4-6.fc7 - Setup readonly loop devices for readonly disks From fedora-cvs-commits at redhat.com Fri Mar 2 16:26:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 11:26:45 -0500 Subject: rpms/binutils/devel binutils.spec,1.111,1.112 Message-ID: <200703021626.l22GQjoH009529@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9515 Modified Files: binutils.spec Log Message: 2.17.50.0.12-2 Index: binutils.spec =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- binutils.spec 1 Mar 2007 09:30:46 -0000 1.111 +++ binutils.spec 2 Mar 2007 16:26:43 -0000 1.112 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.17.50.0.12 -Release: 1 +Release: 2 License: GPL Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -166,6 +166,7 @@ /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/configure.info.gz +exit 0 %preun if [ $1 = 0 ] ;then @@ -176,15 +177,16 @@ /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/configure.info.gz fi +exit 0 %postun -p /sbin/ldconfig %post devel -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz +/sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : %preun devel if [ $1 = 0 ] ;then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : fi %files -f binutils.lang @@ -203,6 +205,9 @@ %{_infodir}/bfd*info* %changelog +* Fri Mar 2 2007 Jakub Jelinek 2.17.50.0.12-2 +- ignore install-info errors from scriptlets (#223678) + * Thu Mar 1 2007 Jakub Jelinek 2.17.50.0.12-1 - update to 2.17.50.0.12 - revert the misdesigned LD_SYMBOLIC{,_FUNCTIONS} env var support, From fedora-cvs-commits at redhat.com Fri Mar 2 18:53:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 13:53:47 -0500 Subject: rpms/nss/devel nss-smartcard-auth.patch, NONE, 1.1 nss.spec, 1.20, 1.21 Message-ID: <200703021853.l22Irlm0028834@cvs.devel.redhat.com> Author: kengert Update of /cvs/dist/rpms/nss/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28491 Modified Files: nss.spec Added Files: nss-smartcard-auth.patch Log Message: * Fri Mar 02 2007 Kai Engert - 3.11.5-2 - Fix rhbz#230545, failure to enable FIPS mode - Fix rhbz#220542, make NSS more tolerant of resets when in the middle of prompting for a user password. nss-smartcard-auth.patch: pk11auth.c | 61 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 20 deletions(-) --- NEW FILE nss-smartcard-auth.patch --- Index: mozilla/security/nss/lib/pk11wrap/pk11auth.c =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11auth.c,v retrieving revision 1.5 diff -u -r1.5 pk11auth.c --- mozilla/security/nss/lib/pk11wrap/pk11auth.c 29 Sep 2005 23:44:39 -0000 1.5 +++ mozilla/security/nss/lib/pk11wrap/pk11auth.c 12 Jan 2007 01:23:20 -0000 @@ -84,6 +84,8 @@ CK_RV crv; SECStatus rv; int64 currtime = PR_Now(); + PRBool mustRetry; + int retry = 0; if (slot->protectedAuthPath) { len = 0; @@ -95,27 +97,46 @@ len = PORT_Strlen(pw); } - PK11_EnterSlotMonitor(slot); - crv = PK11_GETTAB(slot)->C_Login(slot->session,CKU_USER, + do { + PK11_EnterSlotMonitor(slot); + crv = PK11_GETTAB(slot)->C_Login(slot->session,CKU_USER, (unsigned char *)pw,len); - slot->lastLoginCheck = 0; - PK11_ExitSlotMonitor(slot); - switch (crv) { - /* if we're already logged in, we're good to go */ - case CKR_OK: - slot->authTransact = PK11_Global.transaction; - case CKR_USER_ALREADY_LOGGED_IN: - slot->authTime = currtime; - rv = SECSuccess; - break; - case CKR_PIN_INCORRECT: - PORT_SetError(SEC_ERROR_BAD_PASSWORD); - rv = SECWouldBlock; /* everything else is ok, only the pin is bad */ - break; - default: - PORT_SetError(PK11_MapError(crv)); - rv = SECFailure; /* some failure we can't fix by retrying */ - } + slot->lastLoginCheck = 0; + mustRetry = PR_FALSE; + PK11_ExitSlotMonitor(slot); + switch (crv) { + /* if we're already logged in, we're good to go */ + case CKR_OK: + slot->authTransact = PK11_Global.transaction; + case CKR_USER_ALREADY_LOGGED_IN: + slot->authTime = currtime; + rv = SECSuccess; + break; + case CKR_PIN_INCORRECT: + PORT_SetError(SEC_ERROR_BAD_PASSWORD); + rv = SECWouldBlock; /* everything else is ok, only the pin is bad */ + break; + /* someone called reset while we fetched the password, try again once + * if the token is still there. */ + case CKR_SESSION_HANDLE_INVALID: + case CKR_SESSION_CLOSED: + if (retry++ == 0) { + rv = PK11_InitToken(slot,PR_FALSE); + if (rv == SECSuccess) { + if (slot->session != CK_INVALID_SESSION) { + mustRetry = PR_TRUE; + } else { + PORT_SetError(PK11_MapError(crv)); + rv = SECFailure; + } + } + break; + } + default: + PORT_SetError(PK11_MapError(crv)); + rv = SECFailure; /* some failure we can't fix by retrying */ + } + } while (mustRetry); return rv; } Index: nss.spec =================================================================== RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nss.spec 24 Feb 2007 08:43:08 -0000 1.20 +++ nss.spec 2 Mar 2007 18:53:44 -0000 1.21 @@ -4,7 +4,7 @@ Summary: Network Security Services Name: nss Version: 3.11.5 -Release: 1%{?dist} +Release: 2%{?dist} License: MPL/GPL/LGPL URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -25,6 +25,7 @@ Source6: nss-clobber.sh Patch1: nss-no-rpath.patch +Patch2: nss-smartcard-auth.patch %description Network Security Services (NSS) is a set of libraries designed to @@ -76,6 +77,7 @@ %setup -q sh %{SOURCE6} > /dev/null %patch1 -p0 +%patch2 -p0 -b .smartcard-auth.patch %build @@ -160,11 +162,9 @@ %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} done -# Copy the chk files we want -for file in libsoftokn3.chk libfreebl3.chk -do - %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} -done +# These ghost files will be generated in the post step +touch $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.chk +touch $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.chk # Install the empty NSS db files %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb @@ -203,6 +203,8 @@ %post /sbin/ldconfig >/dev/null 2>/dev/null +%{unsupported_tools_directory}/shlibsign -i %{_libdir}/libsoftokn3.so >/dev/null 2>/dev/null +%{unsupported_tools_directory}/shlibsign -i %{_libdir}/libfreebl3.so >/dev/null 2>/dev/null %postun @@ -215,10 +217,11 @@ %{_libdir}/libssl3.so %{_libdir}/libsmime3.so %{_libdir}/libsoftokn3.so -%{_libdir}/libsoftokn3.chk %{_libdir}/libnssckbi.so %{_libdir}/libfreebl3.so -%{_libdir}/libfreebl3.chk +%{unsupported_tools_directory}/shlibsign +%ghost %{_libdir}/libsoftokn3.chk +%ghost %{_libdir}/libfreebl3.chk %dir %{_sysconfdir}/pki/nssdb %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db @@ -240,7 +243,6 @@ %{unsupported_tools_directory}/ocspclnt %{unsupported_tools_directory}/pp %{unsupported_tools_directory}/selfserv -%{unsupported_tools_directory}/shlibsign %{unsupported_tools_directory}/strsclnt %{unsupported_tools_directory}/symkeyutil %{unsupported_tools_directory}/tstclnt @@ -353,6 +355,11 @@ %changelog +* Fri Mar 02 2007 Kai Engert - 3.11.5-2 +- Fix rhbz#230545, failure to enable FIPS mode +- Fix rhbz#220542, make NSS more tolerant of resets when in the + middle of prompting for a user password. + * Sat Feb 24 2007 Kai Engert - 3.11.5-1 - Update to 3.11.5 - This update fixes two security vulnerabilities with SSL 2 From fedora-cvs-commits at redhat.com Fri Mar 2 18:57:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 13:57:51 -0500 Subject: rpms/nss/FC-6 nss-smartcard-auth.patch,NONE,1.1 nss.spec,1.20,1.21 Message-ID: <200703021857.l22IvpU1031964@cvs.devel.redhat.com> Author: kengert Update of /cvs/dist/rpms/nss/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31763 Modified Files: nss.spec Added Files: nss-smartcard-auth.patch Log Message: * Fri Mar 02 2007 Kai Engert - 3.11.5-0.6.1 - Fix rhbz#230545, failure to enable FIPS mode - Fix rhbz#220542, make NSS more tolerant of resets when in the middle of prompting for a user password. nss-smartcard-auth.patch: pk11auth.c | 61 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 20 deletions(-) --- NEW FILE nss-smartcard-auth.patch --- Index: mozilla/security/nss/lib/pk11wrap/pk11auth.c =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11auth.c,v retrieving revision 1.5 diff -u -r1.5 pk11auth.c --- mozilla/security/nss/lib/pk11wrap/pk11auth.c 29 Sep 2005 23:44:39 -0000 1.5 +++ mozilla/security/nss/lib/pk11wrap/pk11auth.c 12 Jan 2007 01:23:20 -0000 @@ -84,6 +84,8 @@ CK_RV crv; SECStatus rv; int64 currtime = PR_Now(); + PRBool mustRetry; + int retry = 0; if (slot->protectedAuthPath) { len = 0; @@ -95,27 +97,46 @@ len = PORT_Strlen(pw); } - PK11_EnterSlotMonitor(slot); - crv = PK11_GETTAB(slot)->C_Login(slot->session,CKU_USER, + do { + PK11_EnterSlotMonitor(slot); + crv = PK11_GETTAB(slot)->C_Login(slot->session,CKU_USER, (unsigned char *)pw,len); - slot->lastLoginCheck = 0; - PK11_ExitSlotMonitor(slot); - switch (crv) { - /* if we're already logged in, we're good to go */ - case CKR_OK: - slot->authTransact = PK11_Global.transaction; - case CKR_USER_ALREADY_LOGGED_IN: - slot->authTime = currtime; - rv = SECSuccess; - break; - case CKR_PIN_INCORRECT: - PORT_SetError(SEC_ERROR_BAD_PASSWORD); - rv = SECWouldBlock; /* everything else is ok, only the pin is bad */ - break; - default: - PORT_SetError(PK11_MapError(crv)); - rv = SECFailure; /* some failure we can't fix by retrying */ - } + slot->lastLoginCheck = 0; + mustRetry = PR_FALSE; + PK11_ExitSlotMonitor(slot); + switch (crv) { + /* if we're already logged in, we're good to go */ + case CKR_OK: + slot->authTransact = PK11_Global.transaction; + case CKR_USER_ALREADY_LOGGED_IN: + slot->authTime = currtime; + rv = SECSuccess; + break; + case CKR_PIN_INCORRECT: + PORT_SetError(SEC_ERROR_BAD_PASSWORD); + rv = SECWouldBlock; /* everything else is ok, only the pin is bad */ + break; + /* someone called reset while we fetched the password, try again once + * if the token is still there. */ + case CKR_SESSION_HANDLE_INVALID: + case CKR_SESSION_CLOSED: + if (retry++ == 0) { + rv = PK11_InitToken(slot,PR_FALSE); + if (rv == SECSuccess) { + if (slot->session != CK_INVALID_SESSION) { + mustRetry = PR_TRUE; + } else { + PORT_SetError(PK11_MapError(crv)); + rv = SECFailure; + } + } + break; + } + default: + PORT_SetError(PK11_MapError(crv)); + rv = SECFailure; /* some failure we can't fix by retrying */ + } + } while (mustRetry); return rv; } Index: nss.spec =================================================================== RCS file: /cvs/dist/rpms/nss/FC-6/nss.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nss.spec 24 Feb 2007 08:45:44 -0000 1.20 +++ nss.spec 2 Mar 2007 18:57:49 -0000 1.21 @@ -4,7 +4,7 @@ Summary: Network Security Services Name: nss Version: 3.11.5 -Release: 0.6.0%{?dist} +Release: 0.6.1%{?dist} License: MPL/GPL/LGPL URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -23,6 +23,7 @@ Source4: blank-key3.db Source5: blank-secmod.db Source6: nss-clobber.sh +Patch1: nss-smartcard-auth.patch %description Network Security Services (NSS) is a set of libraries designed to @@ -73,6 +74,7 @@ %prep %setup -q sh %{SOURCE6} > /dev/null +%patch1 -p0 -b .smartcard-auth.patch %build @@ -157,11 +159,9 @@ %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} done -# Copy the chk files we want -for file in libsoftokn3.chk libfreebl3.chk -do - %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} -done +# These ghost files will be generated in the post step +touch $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.chk +touch $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.chk # Install the empty NSS db files %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb @@ -200,6 +200,8 @@ %post /sbin/ldconfig >/dev/null 2>/dev/null +%{unsupported_tools_directory}/shlibsign -i %{_libdir}/libsoftokn3.so >/dev/null 2>/dev/null +%{unsupported_tools_directory}/shlibsign -i %{_libdir}/libfreebl3.so >/dev/null 2>/dev/null %postun @@ -212,10 +214,11 @@ %{_libdir}/libssl3.so %{_libdir}/libsmime3.so %{_libdir}/libsoftokn3.so -%{_libdir}/libsoftokn3.chk %{_libdir}/libnssckbi.so %{_libdir}/libfreebl3.so -%{_libdir}/libfreebl3.chk +%{unsupported_tools_directory}/shlibsign +%ghost %{_libdir}/libsoftokn3.chk +%ghost %{_libdir}/libfreebl3.chk %dir %{_sysconfdir}/pki/nssdb %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db @@ -237,7 +240,6 @@ %{unsupported_tools_directory}/ocspclnt %{unsupported_tools_directory}/pp %{unsupported_tools_directory}/selfserv -%{unsupported_tools_directory}/shlibsign %{unsupported_tools_directory}/strsclnt %{unsupported_tools_directory}/symkeyutil %{unsupported_tools_directory}/tstclnt @@ -350,6 +352,11 @@ %changelog +* Fri Mar 02 2007 Kai Engert - 3.11.5-0.6.1 +- Fix rhbz#230545, failure to enable FIPS mode +- Fix rhbz#220542, make NSS more tolerant of resets when in the + middle of prompting for a user password. + * Sat Feb 24 2007 Kai Engert - 3.11.5-0.6.0 - Update to 3.11.5 - This update fixes two security vulnerabilities with SSL 2 From fedora-cvs-commits at redhat.com Fri Mar 2 18:59:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 13:59:25 -0500 Subject: rpms/nss/FC-5 nss.spec,1.14,1.15 Message-ID: <200703021859.l22IxPld000811@cvs.devel.redhat.com> Author: kengert Update of /cvs/dist/rpms/nss/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv688 Modified Files: nss.spec Log Message: * Fri Mar 02 2007 Kai Engert - 3.11.5-0.5.1 - Fix rhbz#230545, failure to enable FIPS mode Index: nss.spec =================================================================== RCS file: /cvs/dist/rpms/nss/FC-5/nss.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nss.spec 24 Feb 2007 08:47:27 -0000 1.14 +++ nss.spec 2 Mar 2007 18:59:23 -0000 1.15 @@ -1,9 +1,10 @@ %define nspr_version 4.6.1 +%define unsupported_tools_directory %{_libdir}/nss/unsupported-tools Summary: Network Security Services Name: nss Version: 3.11.5 -Release: 0.5.0%{?dist} +Release: 0.5.1%{?dist} License: MPL/GPL/LGPL URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -141,6 +142,7 @@ %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir} %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir} +%{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory} # Copy the binary libraries we want for file in libnss3.so libssl3.so libsmime3.so libsoftokn3.so libnssckbi.so libfreebl3.so @@ -148,11 +150,9 @@ %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} done -# Copy the chk files we want -for file in libsoftokn3.chk libfreebl3.chk -do - %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} -done +# These ghost files will be generated in the post step +touch $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.chk +touch $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.chk # Copy the development libraries we want for file in libcrmf.a libnssb.a libnssckfw.a @@ -166,6 +166,12 @@ %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir} done +# Copy the binaries we ship as unsupported +for file in shlibsign +do + %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory} +done + # Copy the include files for file in mozilla/dist/public/nss/*.h do @@ -179,6 +185,8 @@ %post /sbin/ldconfig >/dev/null 2>/dev/null +%{unsupported_tools_directory}/shlibsign -i %{_libdir}/libsoftokn3.so >/dev/null 2>/dev/null +%{unsupported_tools_directory}/shlibsign -i %{_libdir}/libfreebl3.so >/dev/null 2>/dev/null %postun @@ -191,10 +199,11 @@ %{_libdir}/libssl3.so %{_libdir}/libsmime3.so %{_libdir}/libsoftokn3.so -%{_libdir}/libsoftokn3.chk %{_libdir}/libnssckbi.so %{_libdir}/libfreebl3.so -%{_libdir}/libfreebl3.chk +%{unsupported_tools_directory}/shlibsign +%ghost %{_libdir}/libsoftokn3.chk +%ghost %{_libdir}/libfreebl3.chk %files tools @@ -311,6 +320,9 @@ %changelog +* Fri Mar 02 2007 Kai Engert - 3.11.5-0.5.1 +- Fix rhbz#230545, failure to enable FIPS mode + * Sat Feb 24 2007 Kai Engert - 3.11.5-0.5.0 - Update to 3.11.5 - This update fixes two security vulnerabilities with SSL 2 From fedora-cvs-commits at redhat.com Fri Mar 2 19:10:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 14:10:36 -0500 Subject: rpms/spamassassin/devel .cvsignore, 1.33, 1.34 sources, 1.32, 1.33 spamassassin.spec, 1.87, 1.88 spamassassin-3.1.3-serviceorder.patch, 1.1, NONE spamassassin-3.1.8-sa-learn.patch, 1.1, NONE Message-ID: <200703021910.l22JAaQs009039@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8939 Modified Files: .cvsignore sources spamassassin.spec Removed Files: spamassassin-3.1.3-serviceorder.patch spamassassin-3.1.8-sa-learn.patch Log Message: 3.2.0-pre2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 13 Feb 2007 20:58:07 -0000 1.33 +++ .cvsignore 2 Mar 2007 19:10:34 -0000 1.34 @@ -1 +1 @@ -Mail-SpamAssassin-3.1.8.tar.bz2 +Mail-SpamAssassin-3.2.0-pre2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 13 Feb 2007 20:58:07 -0000 1.32 +++ sources 2 Mar 2007 19:10:34 -0000 1.33 @@ -1 +1 @@ -e8184a9a4ff11da5bd20b294cfeac7ac Mail-SpamAssassin-3.1.8.tar.bz2 +b530e3b3b828cc0fbe8ee738a300dcef Mail-SpamAssassin-3.2.0-pre2.tar.bz2 Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- spamassassin.spec 19 Feb 2007 16:10:11 -0000 1.87 +++ spamassassin.spec 2 Mar 2007 19:10:34 -0000 1.88 @@ -9,14 +9,17 @@ %define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} +# temporary pre-release number +%define pre pre2 + Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin -Version: 3.1.8 -Release: 2%{?dist} +Version: 3.2.0 +Release: 0.1.%{pre}%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ -Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2 +Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{pre}.tar.bz2 Source2: redhat_local.cf Source3: spamassassin-default.rc Source4: spamassassin-spamc.rc @@ -28,8 +31,6 @@ # Patches 0-99 are RH specific # none yet # Patches 100+ are SVN backports (DO NOT REUSE!) -Patch124: spamassassin-3.1.3-serviceorder.patch -Patch125: spamassassin-3.1.8-sa-learn.patch # end of patches Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Buildroot: %{_tmppath}/%{name}-root @@ -85,8 +86,6 @@ # Patches 0-99 are RH specific # none yet # Patches 100+ are SVN backports (DO NOT REUSE!) -%patch124 -p1 -%patch125 -p1 # end of patches %build @@ -140,7 +139,7 @@ %files -f %{name}-%{version}-filelist %defattr(-,root,root) -%doc BUGS LICENSE NOTICE CREDITS Changes README STATUS TRADEMARK UPGRADE +%doc LICENSE NOTICE CREDITS Changes README TRADEMARK UPGRADE %doc USAGE sample-nonspam.txt sample-spam.txt %config %{_initrddir}/spamassassin %config(noreplace) %{_sysconfdir}/mail/spamassassin @@ -188,6 +187,9 @@ exit 0 %changelog +* Fri Mar 02 2007 Warren Togami 3.2.0-0.1.pre2 +- 3.2.0-pre2 + * Mon Feb 19 2007 Warren Togami 3.1.8-2 - Fix sa-learn regression (#228968) --- spamassassin-3.1.3-serviceorder.patch DELETED --- --- spamassassin-3.1.8-sa-learn.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 20:09:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 15:09:36 -0500 Subject: rpms/virt-manager/devel virt-manager-keyungrab.patch, NONE, 1.1 virt-manager.spec, 1.18, 1.19 Message-ID: <200703022009.l22K9aG4009569@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/virt-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9553 Modified Files: virt-manager.spec Added Files: virt-manager-keyungrab.patch Log Message: Fixed key ungrab virt-manager-keyungrab.patch: vnc.py | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) --- NEW FILE virt-manager-keyungrab.patch --- changeset: 399:ff646711a024 tag: tip parent: 396:98471b6deba9 user: "Daniel P. Berrange " date: Fri Mar 02 15:01:40 2007 -0500 summary: Fixed key ungrab in vnc viewer diff -r 98471b6deba9 -r ff646711a024 src/vncViewer/vnc.py --- a/src/vncViewer/vnc.py Tue Feb 20 14:02:07 2007 -0500 +++ b/src/vncViewer/vnc.py Fri Mar 02 15:01:40 2007 -0500 @@ -272,6 +272,10 @@ class GRFBViewer(gtk.DrawingArea): gtk.gdk.keyval_from_name("Meta_R"), \ gtk.gdk.keyval_from_name("Control_L"), \ gtk.gdk.keyval_from_name("Control_R")) + self.ctrlMods = (gtk.gdk.keyval_from_name("Control_L"), \ + gtk.gdk.keyval_from_name("Control_R")) + self.altMods = (gtk.gdk.keyval_from_name("Alt_L"), \ + gtk.gdk.keyval_from_name("Alt_R")) self.lastKeyVal = None self.lastKeyRepeat = 0 @@ -481,15 +485,6 @@ class GRFBViewer(gtk.DrawingArea): def key_press(self, win, event): - # Allow Ctrl+Alt+Esc to break the pointer grab - if self.will_autograb_pointer(): - if ((event.state & gtk.gdk.CONTROL_MASK and event.state & gtk.gdk.MOD1_MASK) or \ - (event.state & gtk.gdk.MOD2_MASK and event.state & gtk.gdk.MOD1_MASK) or \ - (event.state & gtk.gdk.CONTROL_MASK and event.state & gtk.gdk.MOD2_MASK)) and \ - gtk.gdk.pointer_is_grabbed(): - self.ungrab_pointer() - return - # Key handling in VNC is screwy. The event.keyval from GTK is # interpreted relative to modifier state. This really messes # up with VNC which has no concept of modifiers. If we interpret @@ -506,12 +501,19 @@ class GRFBViewer(gtk.DrawingArea): stickyVal = None + # Check modifiers for sticky keys, or pointer ungrab if val in self.stickyMods: # No previous mod pressed, start counting our presses if self.lastKeyVal == None: self.lastKeyVal = val self.lastKeyRepeat = 1 else: + # Check for Alt+Ctrl or Ctrl+Alt to release grab + if ((self.lastKeyVal in self.ctrlMods and val in self.altMods) or \ + (self.lastKeyVal in self.altMods and val in self.ctrlMods)) and \ + gtk.gdk.pointer_is_grabbed(): + self.ungrab_pointer() + if self.lastKeyVal == val: # Match last key pressed, so increase count self.lastKeyRepeat = self.lastKeyRepeat + 1 Index: virt-manager.spec =================================================================== RCS file: /cvs/dist/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- virt-manager.spec 20 Feb 2007 22:04:34 -0000 1.18 +++ virt-manager.spec 2 Mar 2007 20:09:33 -0000 1.19 @@ -8,7 +8,7 @@ Name: virt-manager Version: 0.3.1 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -18,6 +18,7 @@ Source1: %{name}.pam Source2: %{name}.console Patch1: %{name}-hvm-check.patch +Patch2: %{name}-keyungrab.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -68,6 +69,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %configure @@ -150,6 +152,9 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Fri Mar 2 2007 Daniel P. Berrange - 0.3.1-3.fc7 +- Fixed keyboard ungrab in VNC widget + * Tue Feb 20 2007 Daniel P. Berrange - 0.3.1-2.fc7 - Only check for HVM on Xen hypervisor From fedora-cvs-commits at redhat.com Fri Mar 2 20:13:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 15:13:03 -0500 Subject: rpms/python-virtinst/devel virtinst-restart.patch, NONE, 1.1 python-virtinst.spec, 1.13, 1.14 Message-ID: <200703022013.l22KD3Q1009697@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/python-virtinst/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9681 Modified Files: python-virtinst.spec Added Files: virtinst-restart.patch Log Message: Fixed restart after guest completes virtinst-restart.patch: virt-install | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE virtinst-restart.patch --- changeset: 115:3e18fa0cafc4 tag: tip user: "Daniel P. Berrange " date: Fri Mar 02 09:16:33 2007 -0500 summary: Fix restarting of guest after install completes diff -r 5a1190f54c80 -r 3e18fa0cafc4 virt-install --- a/virt-install Thu Mar 01 10:24:34 2007 -0500 +++ b/virt-install Fri Mar 02 09:16:33 2007 -0500 @@ -475,7 +475,7 @@ def main(): # things installed enough that we should be able to restart # the domain print "Guest installation complete... restarting guest." - dom.start() + dom.create() else: print ("Domain installation does not appear to have been\n" "successful. If it was, you can restart your domain\n" Index: python-virtinst.spec =================================================================== RCS file: /cvs/dist/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- python-virtinst.spec 20 Feb 2007 20:46:47 -0000 1.13 +++ python-virtinst.spec 2 Mar 2007 20:13:01 -0000 1.14 @@ -3,7 +3,7 @@ Summary: Python modules for starting Xen guest installations Name: python-virtinst Version: 0.101.0 -Release: 2%{?dist} +Release: 3%{?dist} Source0: virtinst-%{version}.tar.gz License: GPL Group: Development/Libraries @@ -16,6 +16,7 @@ Requires: urlgrabber BuildRequires: python-devel Obsoletes: python-xeninst < 0.97.0 +Patch1: virtinst-restart.patch %description virtinst is a module to help in starting installations of Fedora/Red @@ -29,6 +30,7 @@ %prep %setup -q -n virtinst-%{version} +%patch1 -p1 %build python setup.py build @@ -50,6 +52,9 @@ %{_sbindir}/virt-install %changelog +* Fri Mar 2 2007 Daniel P. Berrange - 0.101.0-3.fc7 +- Fixed restart of guests after install completes + * Tue Feb 20 2007 Daniel P. Berrange - 0.101.0-2.fc7 - Remove obsolete patches From fedora-cvs-commits at redhat.com Fri Mar 2 20:34:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 15:34:04 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2960,1.2961 Message-ID: <200703022034.l22KY4DR018203@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17916 Modified Files: kernel-2.6.spec Log Message: * Fri Mar 02 2007 Dave Jones - Enable PM_TRACE Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2960 retrieving revision 1.2961 diff -u -r1.2960 -r1.2961 --- kernel-2.6.spec 1 Mar 2007 15:48:07 -0000 1.2960 +++ kernel-2.6.spec 2 Mar 2007 20:34:02 -0000 1.2961 @@ -2036,6 +2036,9 @@ # - tux. %changelog +* Fri Mar 02 2007 Dave Jones +- Enable PM_TRACE + * Thu Mar 1 2007 John W. Linville - update git-wireless-dev.patch (current as of 2007-02-27) From fedora-cvs-commits at redhat.com Fri Mar 2 20:34:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 15:34:05 -0500 Subject: rpms/kernel/devel/configs config-generic,1.296,1.297 Message-ID: <200703022034.l22KY5rl018214@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv17916/configs Modified Files: config-generic Log Message: * Fri Mar 02 2007 Dave Jones - Enable PM_TRACE Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- config-generic 1 Mar 2007 15:48:07 -0000 1.296 +++ config-generic 2 Mar 2007 20:34:02 -0000 1.297 @@ -2917,8 +2917,9 @@ CONFIG_PM_LEGACY=y # CONFIG_PM_SYSFS_DEPRECATED is not set -# CONFIG_PM_DEBUG is not set -# CONFIG_PM_TRACE is not set +CONFIG_PM_DEBUG=y +CONFIG_PM_TRACE=y +# CONFIG_DISABLE_CONSOLE_SUSPEND is not set CONFIG_CRASH=m From fedora-cvs-commits at redhat.com Fri Mar 2 20:55:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 15:55:35 -0500 Subject: rpms/kernel/FC-6/configs config-generic, 1.264, 1.264.26.1 config-powerpc64-iseries, 1.15, 1.15.26.1 config-s390-generic, 1.22, 1.22.26.1 Message-ID: <200703022055.l22KtZq5027473@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv27389/configs Modified Files: Tag: private-linville-jwltest-fc6-24-branch config-generic config-powerpc64-iseries config-s390-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v retrieving revision 1.264 retrieving revision 1.264.26.1 diff -u -r1.264 -r1.264.26.1 --- config-generic 8 Jan 2007 16:47:48 -0000 1.264 +++ config-generic 2 Mar 2007 20:55:33 -0000 1.264.26.1 @@ -906,6 +906,9 @@ # CONFIG_TIPC_DEBUG is not set CONFIG_NETLABEL=y +CONFIG_CFG80211=m +# CONFIG_CFG80211_WEXT_COMPAT is not set +# CONFIG_NL80211 is not set # # QoS and/or fair queueing @@ -1063,6 +1066,7 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m +CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_QLA3XXX=m # CONFIG_DGRS is not set @@ -1167,6 +1171,16 @@ # # Wireless 802.11b ISA/PCI cards support # +CONFIG_MAC80211=m +CONFIG_MAC80211_LEDS=y +CONFIG_MAC80211_DEBUG=y +# CONFIG_MAC80211_VERBOSE_DEBUG is not set +CONFIG_MAC80211_LOWTX_FRAME_DUMP=y +CONFIG_TKIP_DEBUG=y +CONFIG_MAC80211_DEBUG_COUNTERS=y +CONFIG_HOSTAPD_WPA_TESTING=y +CONFIG_MAC80211_IBSS_DEBUG=y +CONFIG_MAC80211_VERBOSE_PS_DEBUG=y CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -1181,6 +1195,36 @@ CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +CONFIG_BCM43XX_MAC80211=m +CONFIG_BCM43XX_MAC80211_PCI=y +CONFIG_BCM43XX_MAC80211_PCMCIA=y +CONFIG_BCM43XX_MAC80211_DEBUG=y +CONFIG_BCM43XX_MAC80211_DMA=y +CONFIG_BCM43XX_MAC80211_PIO=y +CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set +# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set +CONFIG_RT2X00=y +CONFIG_RT2400PCI=m +CONFIG_RT2400PCI_DEBUG=y +CONFIG_RT2500PCI=m +CONFIG_RT2500PCI_DEBUG=y +CONFIG_RT61PCI=m +CONFIG_RT61PCI_DEBUG=y +CONFIG_RT2500USB=m +CONFIG_RT2500USB_DEBUG=y +CONFIG_RT73USB=m +CONFIG_RT73USB_DEBUG=y +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ZD1211RW_MAC80211=m +CONFIG_ZD1211RW_MAC80211_DEBUG=y +CONFIG_RTL818X=y +CONFIG_RTL8187=m +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_DEBUG=y CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1529,6 +1573,7 @@ CONFIG_N_HDLC=m # CONFIG_STALDRV is not set # CONFIG_IBM_ASM is not set +CONFIG_SONICS_SILICON_BACKPLANE=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_TCG_TPM=m @@ -1811,6 +1856,14 @@ CONFIG_MAX_RAW_DEVS=8192 CONFIG_HANGCHECK_TIMER=m +CONFIG_SSB=m +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SILENT=n +CONFIG_SSB_DEBUG=n +CONFIG_SSB_SERIAL=n +CONFIG_SSB_DRIVER_PCICORE=y + # # Multimedia devices # @@ -2193,6 +2246,7 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_CS=m +CONFIG_USB_SSB_HCD=m # # USB Device Class drivers @@ -2736,6 +2790,8 @@ # CONFIG_CRC16=m CONFIG_CRC32=m +CONFIG_CRC_ITU_T=m +CONFIG_EEPROM_93CX6=m CONFIG_CRC_CCITT=m CONFIG_ZLIB_INFLATE=y Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-powerpc64-iseries,v retrieving revision 1.15 retrieving revision 1.15.26.1 diff -u -r1.15 -r1.15.26.1 --- config-powerpc64-iseries 21 Dec 2006 21:45:14 -0000 1.15 +++ config-powerpc64-iseries 2 Mar 2007 20:55:33 -0000 1.15.26.1 @@ -56,6 +56,7 @@ CONFIG_SCSI_IBMVSCSI=m CONFIG_SERIAL_ICOM=m # CONFIG_ISDN is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set # CONFIG_DVB is not set # CONFIG_VIDEO_DEV is not set Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v retrieving revision 1.22 retrieving revision 1.22.26.1 diff -u -r1.22 -r1.22.26.1 --- config-s390-generic 21 Dec 2006 21:45:14 -0000 1.22 +++ config-s390-generic 2 Mar 2007 20:55:33 -0000 1.22.26.1 @@ -116,6 +116,7 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_NET_RADIO is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set # The s390 CPU does not have hardware support for big pages at all. From fedora-cvs-commits at redhat.com Fri Mar 2 20:55:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 15:55:35 -0500 Subject: rpms/kernel/FC-6 jwltest-bcm43xx-2_6_20.patch, NONE, 1.1.12.1 jwltest-bcm43xx-host_strip_iv_icv-undo.patch, NONE, 1.1.12.1 jwltest-bcm43xx-post-2_6_20.patch, NONE, 1.1.12.1 jwltest-bcm43xx-workqueue-undo.patch, NONE, 1.1.12.1 jwltest-iwlwifi-2_6_19-fixup.patch, NONE, 1.1.4.1 jwltest-iwlwifi.patch, NONE, 1.1.4.1 jwltest-mac80211-backport-2_6_19-fixup.patch, NONE, 1.1.4.1 jwltest-mac80211-backport.patch, NONE, 1.1.4.1 jwltest-prism54-wpa-fix.patch, NONE, 1.1.16.1 jwltest-softmac_wx_get_rate-running-check.patch, NONE, 1.1.20.1 kernel-2.6.spec, 1.2911, 1.2911.12.1 Message-ID: <200703022055.l22KtZYH027447@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv27389 Modified Files: Tag: private-linville-jwltest-fc6-24-branch kernel-2.6.spec Added Files: Tag: private-linville-jwltest-fc6-24-branch jwltest-bcm43xx-2_6_20.patch jwltest-bcm43xx-host_strip_iv_icv-undo.patch jwltest-bcm43xx-post-2_6_20.patch jwltest-bcm43xx-workqueue-undo.patch jwltest-iwlwifi-2_6_19-fixup.patch jwltest-iwlwifi.patch jwltest-mac80211-backport-2_6_19-fixup.patch jwltest-mac80211-backport.patch jwltest-prism54-wpa-fix.patch jwltest-softmac_wx_get_rate-running-check.patch Log Message: jwltest-bcm43xx-2_6_20.patch: bcm43xx.h | 34 ++++++++ bcm43xx_main.c | 228 ++++++++++++++++++++++++++++++++------------------------ bcm43xx_power.c | 28 +++++- bcm43xx_wx.c | 4 bcm43xx_xmit.c | 18 ---- 5 files changed, 188 insertions(+), 124 deletions(-) --- NEW FILE jwltest-bcm43xx-2_6_20.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h.orig 2007-02-08 14:17:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h 2007-02-08 14:34:46.000000000 -0500 @@ -159,6 +159,7 @@ /* Chipcommon registers. */ #define BCM43xx_CHIPCOMMON_CAPABILITIES 0x04 +#define BCM43xx_CHIPCOMMON_CTL 0x28 #define BCM43xx_CHIPCOMMON_PLLONDELAY 0xB0 #define BCM43xx_CHIPCOMMON_FREFSELDELAY 0xB4 #define BCM43xx_CHIPCOMMON_SLOWCLKCTL 0xB8 @@ -172,6 +173,33 @@ /* SBTOPCI2 values. */ #define BCM43xx_SBTOPCI2_PREFETCH 0x4 #define BCM43xx_SBTOPCI2_BURST 0x8 +#define BCM43xx_SBTOPCI2_MEMREAD_MULTI 0x20 + +/* PCI-E core registers. */ +#define BCM43xx_PCIECORE_REG_ADDR 0x0130 +#define BCM43xx_PCIECORE_REG_DATA 0x0134 +#define BCM43xx_PCIECORE_MDIO_CTL 0x0128 +#define BCM43xx_PCIECORE_MDIO_DATA 0x012C + +/* PCI-E registers. */ +#define BCM43xx_PCIE_TLP_WORKAROUND 0x0004 +#define BCM43xx_PCIE_DLLP_LINKCTL 0x0100 + +/* PCI-E MDIO bits. */ +#define BCM43xx_PCIE_MDIO_ST 0x40000000 +#define BCM43xx_PCIE_MDIO_WT 0x10000000 +#define BCM43xx_PCIE_MDIO_DEV 22 +#define BCM43xx_PCIE_MDIO_REG 18 +#define BCM43xx_PCIE_MDIO_TA 0x00020000 +#define BCM43xx_PCIE_MDIO_TC 0x0100 + +/* MDIO devices. */ +#define BCM43xx_MDIO_SERDES_RX 0x1F + +/* SERDES RX registers. */ +#define BCM43xx_SERDES_RXTIMER 0x2 +#define BCM43xx_SERDES_CDR 0x6 +#define BCM43xx_SERDES_CDR_BW 0x7 /* Chipcommon capabilities. */ #define BCM43xx_CAPABILITIES_PCTL 0x00040000 @@ -221,6 +249,7 @@ #define BCM43xx_COREID_USB20_HOST 0x819 #define BCM43xx_COREID_USB20_DEV 0x81a #define BCM43xx_COREID_SDIO_HOST 0x81b +#define BCM43xx_COREID_PCIE 0x820 /* Core Information Registers */ #define BCM43xx_CIR_BASE 0xf00 @@ -365,6 +394,9 @@ #define BCM43xx_DEFAULT_SHORT_RETRY_LIMIT 7 #define BCM43xx_DEFAULT_LONG_RETRY_LIMIT 4 +/* FIXME: the next line is a guess as to what the maximum RSSI value might be */ +#define RX_RSSI_MAX 60 + /* Max size of a security key */ #define BCM43xx_SEC_KEYSIZE 16 /* Security algorithms. */ @@ -787,7 +819,7 @@ struct bcm43xx_private { struct tasklet_struct isr_tasklet; /* Periodic tasks */ - struct work_struct periodic_work; + struct delayed_work periodic_work; unsigned int periodic_state; struct work_struct restart_work; --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c.orig 2006-11-29 16:57:37.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c 2007-02-08 14:34:46.000000000 -0500 @@ -47,9 +47,6 @@ #define BCM43xx_WX_VERSION 18 #define MAX_WX_STRING 80 -/* FIXME: the next line is a guess as to what the maximum RSSI value might be */ -#define RX_RSSI_MAX 60 - static int bcm43xx_wx_get_name(struct net_device *net_dev, struct iw_request_info *info, @@ -693,6 +690,7 @@ static int bcm43xx_wx_set_swencryption(s bcm->ieee->host_encrypt = !!on; bcm->ieee->host_decrypt = !!on; bcm->ieee->host_build_iv = !on; + bcm->ieee->host_strip_iv_icv = !on; spin_unlock_irqrestore(&bcm->irq_lock, flags); mutex_unlock(&bcm->mutex); --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig 2007-02-08 14:17:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2007-02-08 14:34:46.000000000 -0500 @@ -130,6 +130,10 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for { PCI_VENDOR_ID_BROADCOM, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Broadcom 4307 802.11b */ { PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + /* Broadcom 4311 802.11(a)/b/g */ + { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + /* Broadcom 4312 802.11a/b/g */ + { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Broadcom 4318 802.11b/g */ { PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Broadcom 4319 802.11a/b/g */ @@ -2600,8 +2604,9 @@ static int bcm43xx_probe_cores(struct bc /* fetch sb_id_hi from core information registers */ sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI); - core_id = (sb_id_hi & 0xFFF0) >> 4; - core_rev = (sb_id_hi & 0xF); + core_id = (sb_id_hi & 0x8FF0) >> 4; + core_rev = (sb_id_hi & 0x7000) >> 8; + core_rev |= (sb_id_hi & 0xF); core_vendor = (sb_id_hi & 0xFFFF0000) >> 16; /* if present, chipcommon is always core 0; read the chipid from it */ @@ -2679,14 +2684,10 @@ static int bcm43xx_probe_cores(struct bc bcm->chip_id, bcm->chip_rev); dprintk(KERN_INFO PFX "Number of cores: %d\n", core_count); if (bcm->core_chipcommon.available) { - dprintk(KERN_INFO PFX "Core 0: ID 0x%x, rev 0x%x, vendor 0x%x, %s\n", - core_id, core_rev, core_vendor, - bcm43xx_core_enabled(bcm) ? "enabled" : "disabled"); - } - - if (bcm->core_chipcommon.available) + dprintk(KERN_INFO PFX "Core 0: ID 0x%x, rev 0x%x, vendor 0x%x\n", + core_id, core_rev, core_vendor); current_core = 1; - else + } else current_core = 0; for ( ; current_core < core_count; current_core++) { struct bcm43xx_coreinfo *core; @@ -2700,17 +2701,17 @@ static int bcm43xx_probe_cores(struct bc sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI); /* extract core_id, core_rev, core_vendor */ - core_id = (sb_id_hi & 0xFFF0) >> 4; - core_rev = (sb_id_hi & 0xF); + core_id = (sb_id_hi & 0x8FF0) >> 4; + core_rev = ((sb_id_hi & 0xF) | ((sb_id_hi & 0x7000) >> 8)); core_vendor = (sb_id_hi & 0xFFFF0000) >> 16; - dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x, %s\n", - current_core, core_id, core_rev, core_vendor, - bcm43xx_core_enabled(bcm) ? "enabled" : "disabled" ); + dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x\n", + current_core, core_id, core_rev, core_vendor); core = NULL; switch (core_id) { case BCM43xx_COREID_PCI: + case BCM43xx_COREID_PCIE: core = &bcm->core_pci; if (core->available) { printk(KERN_WARNING PFX "Multiple PCI cores found.\n"); @@ -2749,12 +2750,12 @@ static int bcm43xx_probe_cores(struct bc case 6: case 7: case 9: + case 10: break; default: - printk(KERN_ERR PFX "Error: Unsupported 80211 core revision %u\n", + printk(KERN_WARNING PFX + "Unsupported 80211 core revision %u\n", core_rev); - err = -ENODEV; - goto out; } bcm->nr_80211_available++; core->priv = ext_80211; @@ -2868,16 +2869,14 @@ static int bcm43xx_wireless_core_init(st u32 sbimconfiglow; u8 limit; - if (bcm->chip_rev < 5) { + if (bcm->core_pci.rev <= 5 && bcm->core_pci.id != BCM43xx_COREID_PCIE) { sbimconfiglow = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW); sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK; sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK; if (bcm->bustype == BCM43xx_BUSTYPE_PCI) sbimconfiglow |= 0x32; - else if (bcm->bustype == BCM43xx_BUSTYPE_SB) - sbimconfiglow |= 0x53; else - assert(0); + sbimconfiglow |= 0x53; bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, sbimconfiglow); } @@ -3004,22 +3003,64 @@ static void bcm43xx_pcicore_broadcast_va static int bcm43xx_pcicore_commit_settings(struct bcm43xx_private *bcm) { - int err; - struct bcm43xx_coreinfo *old_core; + int err = 0; - old_core = bcm->current_core; - err = bcm43xx_switch_core(bcm, &bcm->core_pci); - if (err) - goto out; + bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL); - bcm43xx_pcicore_broadcast_value(bcm, 0xfd8, 0x00000000); + if (bcm->core_chipcommon.available) { + err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon); + if (err) + goto out; + + bcm43xx_pcicore_broadcast_value(bcm, 0xfd8, 0x00000000); + + /* this function is always called when a PCI core is mapped */ + err = bcm43xx_switch_core(bcm, &bcm->core_pci); + if (err) + goto out; + } else + bcm43xx_pcicore_broadcast_value(bcm, 0xfd8, 0x00000000); + + bcm43xx_interrupt_enable(bcm, bcm->irq_savedstate); - bcm43xx_switch_core(bcm, old_core); - assert(err == 0); out: return err; } +static u32 bcm43xx_pcie_reg_read(struct bcm43xx_private *bcm, u32 address) +{ + bcm43xx_write32(bcm, BCM43xx_PCIECORE_REG_ADDR, address); + return bcm43xx_read32(bcm, BCM43xx_PCIECORE_REG_DATA); +} + +static void bcm43xx_pcie_reg_write(struct bcm43xx_private *bcm, u32 address, + u32 data) +{ + bcm43xx_write32(bcm, BCM43xx_PCIECORE_REG_ADDR, address); + bcm43xx_write32(bcm, BCM43xx_PCIECORE_REG_DATA, data); +} + +static void bcm43xx_pcie_mdio_write(struct bcm43xx_private *bcm, u8 dev, u8 reg, + u16 data) +{ + int i; + + bcm43xx_write32(bcm, BCM43xx_PCIECORE_MDIO_CTL, 0x0082); + bcm43xx_write32(bcm, BCM43xx_PCIECORE_MDIO_DATA, BCM43xx_PCIE_MDIO_ST | + BCM43xx_PCIE_MDIO_WT | (dev << BCM43xx_PCIE_MDIO_DEV) | + (reg << BCM43xx_PCIE_MDIO_REG) | BCM43xx_PCIE_MDIO_TA | + data); + udelay(10); + + for (i = 0; i < 10; i++) { + if (bcm43xx_read32(bcm, BCM43xx_PCIECORE_MDIO_CTL) & + BCM43xx_PCIE_MDIO_TC) + break; + msleep(1); + } + bcm43xx_write32(bcm, BCM43xx_PCIECORE_MDIO_CTL, 0); +} + /* Make an I/O Core usable. "core_mask" is the bitmask of the cores to enable. * To enable core 0, pass a core_mask of 1<<0 */ @@ -3039,7 +3080,8 @@ static int bcm43xx_setup_backplane_pci_c if (err) goto out; - if (bcm->core_pci.rev < 6) { + if (bcm->current_core->rev < 6 && + bcm->current_core->id == BCM43xx_COREID_PCI) { value = bcm43xx_read32(bcm, BCM43xx_CIR_SBINTVEC); value |= (1 << backplane_flag_nr); bcm43xx_write32(bcm, BCM43xx_CIR_SBINTVEC, value); @@ -3057,21 +3099,46 @@ static int bcm43xx_setup_backplane_pci_c } } - value = bcm43xx_read32(bcm, BCM43xx_PCICORE_SBTOPCI2); - value |= BCM43xx_SBTOPCI2_PREFETCH | BCM43xx_SBTOPCI2_BURST; - bcm43xx_write32(bcm, BCM43xx_PCICORE_SBTOPCI2, value); - - if (bcm->core_pci.rev < 5) { - value = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW); - value |= (2 << BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_SHIFT) - & BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK; - value |= (3 << BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_SHIFT) - & BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK; - bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, value); - err = bcm43xx_pcicore_commit_settings(bcm); - assert(err == 0); + if (bcm->current_core->id == BCM43xx_COREID_PCI) { + value = bcm43xx_read32(bcm, BCM43xx_PCICORE_SBTOPCI2); + value |= BCM43xx_SBTOPCI2_PREFETCH | BCM43xx_SBTOPCI2_BURST; + bcm43xx_write32(bcm, BCM43xx_PCICORE_SBTOPCI2, value); + + if (bcm->current_core->rev < 5) { + value = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW); + value |= (2 << BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_SHIFT) + & BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK; + value |= (3 << BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_SHIFT) + & BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK; + bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, value); + err = bcm43xx_pcicore_commit_settings(bcm); + assert(err == 0); + } else if (bcm->current_core->rev >= 11) { + value = bcm43xx_read32(bcm, BCM43xx_PCICORE_SBTOPCI2); + value |= BCM43xx_SBTOPCI2_MEMREAD_MULTI; + bcm43xx_write32(bcm, BCM43xx_PCICORE_SBTOPCI2, value); + } + } else { + if (bcm->current_core->rev == 0 || bcm->current_core->rev == 1) { + value = bcm43xx_pcie_reg_read(bcm, BCM43xx_PCIE_TLP_WORKAROUND); + value |= 0x8; + bcm43xx_pcie_reg_write(bcm, BCM43xx_PCIE_TLP_WORKAROUND, + value); + } + if (bcm->current_core->rev == 0) { + bcm43xx_pcie_mdio_write(bcm, BCM43xx_MDIO_SERDES_RX, + BCM43xx_SERDES_RXTIMER, 0x8128); + bcm43xx_pcie_mdio_write(bcm, BCM43xx_MDIO_SERDES_RX, + BCM43xx_SERDES_CDR, 0x0100); + bcm43xx_pcie_mdio_write(bcm, BCM43xx_MDIO_SERDES_RX, + BCM43xx_SERDES_CDR_BW, 0x1466); + } else if (bcm->current_core->rev == 1) { + value = bcm43xx_pcie_reg_read(bcm, BCM43xx_PCIE_DLLP_LINKCTL); + value |= 0x40; + bcm43xx_pcie_reg_write(bcm, BCM43xx_PCIE_DLLP_LINKCTL, + value); + } } - out_switch_back: err = bcm43xx_switch_core(bcm, old_core); out: @@ -3140,55 +3207,28 @@ static void bcm43xx_periodic_every15sec( static void do_periodic_work(struct bcm43xx_private *bcm) { - unsigned int state; - - state = bcm->periodic_state; - if (state % 8 == 0) + if (bcm->periodic_state % 8 == 0) bcm43xx_periodic_every120sec(bcm); - if (state % 4 == 0) + if (bcm->periodic_state % 4 == 0) bcm43xx_periodic_every60sec(bcm); - if (state % 2 == 0) + if (bcm->periodic_state % 2 == 0) bcm43xx_periodic_every30sec(bcm); - if (state % 1 == 0) - bcm43xx_periodic_every15sec(bcm); - bcm->periodic_state = state + 1; + bcm43xx_periodic_every15sec(bcm); schedule_delayed_work(&bcm->periodic_work, HZ * 15); } -/* Estimate a "Badness" value based on the periodic work - * state-machine state. "Badness" is worse (bigger), if the - * periodic work will take longer. - */ -static int estimate_periodic_work_badness(unsigned int state) -{ - int badness = 0; - - if (state % 8 == 0) /* every 120 sec */ - badness += 10; - if (state % 4 == 0) /* every 60 sec */ - badness += 5; - if (state % 2 == 0) /* every 30 sec */ - badness += 1; - if (state % 1 == 0) /* every 15 sec */ - badness += 1; - -#define BADNESS_LIMIT 4 - return badness; -} - -static void bcm43xx_periodic_work_handler(void *d) +static void bcm43xx_periodic_work_handler(struct work_struct *work) { - struct bcm43xx_private *bcm = d; + struct bcm43xx_private *bcm = + container_of(work, struct bcm43xx_private, periodic_work.work); struct net_device *net_dev = bcm->net_dev; unsigned long flags; u32 savedirqs = 0; - int badness; unsigned long orig_trans_start = 0; mutex_lock(&bcm->mutex); - badness = estimate_periodic_work_badness(bcm->periodic_state); - if (badness > BADNESS_LIMIT) { + if (unlikely(bcm->periodic_state % 4 == 0)) { /* Periodic work will take a long time, so we want it to * be preemtible. */ @@ -3220,7 +3260,7 @@ static void bcm43xx_periodic_work_handle do_periodic_work(bcm); - if (badness > BADNESS_LIMIT) { + if (unlikely(bcm->periodic_state % 4 == 0)) { spin_lock_irqsave(&bcm->irq_lock, flags); tasklet_enable(&bcm->isr_tasklet); bcm43xx_interrupt_enable(bcm, savedirqs); @@ -3231,6 +3271,7 @@ static void bcm43xx_periodic_work_handle net_dev->trans_start = orig_trans_start; } mmiowb(); + bcm->periodic_state++; spin_unlock_irqrestore(&bcm->irq_lock, flags); mutex_unlock(&bcm->mutex); } @@ -3242,11 +3283,11 @@ void bcm43xx_periodic_tasks_delete(struc void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm) { - struct work_struct *work = &(bcm->periodic_work); + struct delayed_work *work = &bcm->periodic_work; assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED); - INIT_WORK(work, bcm43xx_periodic_work_handler, bcm); - schedule_work(work); + INIT_DELAYED_WORK(work, bcm43xx_periodic_work_handler); + schedule_delayed_work(work, 0); } static void bcm43xx_security_init(struct bcm43xx_private *bcm) @@ -3598,7 +3639,7 @@ static int bcm43xx_init_board(struct bcm bcm43xx_periodic_tasks_setup(bcm); /*FIXME: This should be handled by softmac instead. */ - schedule_work(&bcm->softmac->associnfo.work); + schedule_delayed_work(&bcm->softmac->associnfo.work, 0); out: mutex_unlock(&(bcm)->mutex); @@ -3676,7 +3717,7 @@ static int bcm43xx_read_phyinfo(struct b bcm->ieee->freq_band = IEEE80211_24GHZ_BAND; break; case BCM43xx_PHYTYPE_G: - if (phy_rev > 7) + if (phy_rev > 8) phy_rev_ok = 0; bcm->ieee->modulation = IEEE80211_OFDM_MODULATION | IEEE80211_CCK_MODULATION; @@ -3688,6 +3729,8 @@ static int bcm43xx_read_phyinfo(struct b phy_type); return -ENODEV; }; + bcm->ieee->perfect_rssi = RX_RSSI_MAX; + bcm->ieee->worst_rssi = 0; if (!phy_rev_ok) { printk(KERN_WARNING PFX "Invalid PHY Revision %x\n", phy_rev); @@ -3974,11 +4017,6 @@ static int bcm43xx_ieee80211_hard_start_ return NETDEV_TX_OK; } -static struct net_device_stats * bcm43xx_net_get_stats(struct net_device *net_dev) -{ - return &(bcm43xx_priv(net_dev)->ieee->stats); -} - static void bcm43xx_net_tx_timeout(struct net_device *net_dev) { struct bcm43xx_private *bcm = bcm43xx_priv(net_dev); @@ -4092,7 +4130,6 @@ static int __devinit bcm43xx_init_one(st net_dev->open = bcm43xx_net_open; net_dev->stop = bcm43xx_net_stop; - net_dev->get_stats = bcm43xx_net_get_stats; net_dev->tx_timeout = bcm43xx_net_tx_timeout; #ifdef CONFIG_NET_POLL_CONTROLLER net_dev->poll_controller = bcm43xx_net_poll_controller; @@ -4149,9 +4186,10 @@ static void __devexit bcm43xx_remove_one /* Hard-reset the chip. Do not call this directly. * Use bcm43xx_controller_restart() */ -static void bcm43xx_chip_reset(void *_bcm) +static void bcm43xx_chip_reset(struct work_struct *work) { - struct bcm43xx_private *bcm = _bcm; + struct bcm43xx_private *bcm = + container_of(work, struct bcm43xx_private, restart_work); struct bcm43xx_phyinfo *phy; int err = -ENODEV; @@ -4178,7 +4216,7 @@ void bcm43xx_controller_restart(struct b if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) return; printk(KERN_ERR PFX "Controller RESET (%s) ...\n", reason); - INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset, bcm); + INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset); schedule_work(&bcm->restart_work); } --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_power.c.orig 2007-02-08 14:17:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_power.c 2007-02-08 14:34:46.000000000 -0500 @@ -153,8 +153,6 @@ int bcm43xx_pctl_init(struct bcm43xx_pri int err, maxfreq; struct bcm43xx_coreinfo *old_core; - if (!(bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL)) - return 0; old_core = bcm->current_core; err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon); if (err == -ENODEV) @@ -162,11 +160,27 @@ int bcm43xx_pctl_init(struct bcm43xx_pri if (err) goto out; - maxfreq = bcm43xx_pctl_clockfreqlimit(bcm, 1); - bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_PLLONDELAY, - (maxfreq * 150 + 999999) / 1000000); - bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_FREFSELDELAY, - (maxfreq * 15 + 999999) / 1000000); + if (bcm->chip_id == 0x4321) { + if (bcm->chip_rev == 0) + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_CTL, 0x03A4); + if (bcm->chip_rev == 1) + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_CTL, 0x00A4); + } + + if (bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL) { + if (bcm->current_core->rev >= 10) { + /* Set Idle Power clock rate to 1Mhz */ + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_SYSCLKCTL, + (bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SYSCLKCTL) + & 0x0000FFFF) | 0x40000); + } else { + maxfreq = bcm43xx_pctl_clockfreqlimit(bcm, 1); + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_PLLONDELAY, + (maxfreq * 150 + 999999) / 1000000); + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_FREFSELDELAY, + (maxfreq * 15 + 999999) / 1000000); + } + } err = bcm43xx_switch_core(bcm, old_core); assert(err == 0); --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c.orig 2006-11-29 16:57:37.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c 2007-02-08 14:34:46.000000000 -0500 @@ -544,24 +544,6 @@ int bcm43xx_rx(struct bcm43xx_private *b } frame_ctl = le16_to_cpu(wlhdr->frame_ctl); - if ((frame_ctl & IEEE80211_FCTL_PROTECTED) && !bcm->ieee->host_decrypt) { - frame_ctl &= ~IEEE80211_FCTL_PROTECTED; - wlhdr->frame_ctl = cpu_to_le16(frame_ctl); - /* trim IV and ICV */ - /* FIXME: this must be done only for WEP encrypted packets */ - if (skb->len < 32) { - dprintkl(KERN_ERR PFX "RX packet dropped (PROTECTED flag " - "set and length < 32)\n"); - return -EINVAL; - } else { - memmove(skb->data + 4, skb->data, 24); - skb_pull(skb, 4); - skb_trim(skb, skb->len - 4); - stats.len -= 8; - } - wlhdr = (struct ieee80211_hdr_4addr *)(skb->data); - } - switch (WLAN_FC_GET_TYPE(frame_ctl)) { case IEEE80211_FTYPE_MGMT: ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats); jwltest-bcm43xx-host_strip_iv_icv-undo.patch: bcm43xx_wx.c | 1 - bcm43xx_xmit.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) --- NEW FILE jwltest-bcm43xx-host_strip_iv_icv-undo.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c.orig 2007-02-08 15:50:54.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c 2007-02-08 15:49:59.000000000 -0500 @@ -690,7 +690,6 @@ static int bcm43xx_wx_set_swencryption(s bcm->ieee->host_encrypt = !!on; bcm->ieee->host_decrypt = !!on; bcm->ieee->host_build_iv = !on; - bcm->ieee->host_strip_iv_icv = !on; spin_unlock_irqrestore(&bcm->irq_lock, flags); mutex_unlock(&bcm->mutex); --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c.orig 2007-02-08 15:48:53.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c 2007-02-08 15:49:59.000000000 -0500 @@ -544,6 +544,24 @@ int bcm43xx_rx(struct bcm43xx_private *b } frame_ctl = le16_to_cpu(wlhdr->frame_ctl); + if ((frame_ctl & IEEE80211_FCTL_PROTECTED) && !bcm->ieee->host_decrypt) { + frame_ctl &= ~IEEE80211_FCTL_PROTECTED; + wlhdr->frame_ctl = cpu_to_le16(frame_ctl); + /* trim IV and ICV */ + /* FIXME: this must be done only for WEP encrypted packets */ + if (skb->len < 32) { + dprintkl(KERN_ERR PFX "RX packet dropped (PROTECTED flag " + "set and length < 32)\n"); + return -EINVAL; + } else { + memmove(skb->data + 4, skb->data, 24); + skb_pull(skb, 4); + skb_trim(skb, skb->len - 4); + stats.len -= 8; + } + wlhdr = (struct ieee80211_hdr_4addr *)(skb->data); + } + switch (WLAN_FC_GET_TYPE(frame_ctl)) { case IEEE80211_FTYPE_MGMT: ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats); jwltest-bcm43xx-post-2_6_20.patch: bcm43xx.h | 9 +- bcm43xx_dma.c | 171 +++++++++++++++++++++++++++++++++++-------------- bcm43xx_ilt.c | 15 ++++ bcm43xx_ilt.h | 1 bcm43xx_main.c | 45 ++++++------ bcm43xx_phy.c | 195 ++++++++++++++++++++++++-------------------------------- bcm43xx_radio.c | 13 ++- bcm43xx_wx.c | 28 ++++---- bcm43xx_xmit.h | 10 -- 9 files changed, 275 insertions(+), 212 deletions(-) --- NEW FILE jwltest-bcm43xx-post-2_6_20.patch --- diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h index 8286678..6b1749b 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx.h @@ -21,7 +21,7 @@ #include "bcm43xx_leds.h" #define PFX KBUILD_MODNAME ": " #define BCM43xx_SWITCH_CORE_MAX_RETRIES 50 -#define BCM43xx_IRQWAIT_MAX_RETRIES 50 +#define BCM43xx_IRQWAIT_MAX_RETRIES 100 #define BCM43xx_IO_SIZE 8192 @@ -333,7 +333,7 @@ #define BCM43xx_SBF_PS1 0x02000000 #define BCM43xx_SBF_PS2 0x04000000 #define BCM43xx_SBF_NO_SSID_BCAST 0x08000000 #define BCM43xx_SBF_TIME_UPDATE 0x10000000 -#define BCM43xx_SBF_80000000 0x80000000 /*FIXME: fix name*/ +#define BCM43xx_SBF_MODE_G 0x80000000 /* Microcode */ #define BCM43xx_UCODE_REVISION 0x0000 @@ -503,8 +503,6 @@ struct bcm43xx_sprominfo { u8 et1macaddr[6]; u8 et0phyaddr:5; u8 et1phyaddr:5; - u8 et0mdcport:1; - u8 et1mdcport:1; u8 boardrev; u8 locale:4; u8 antennas_aphy:2; @@ -538,7 +536,7 @@ #define BCM43xx_LO_COUNT (14*4) struct bcm43xx_phyinfo { /* Hardware Data */ - u8 version; + u8 analog; u8 type; u8 rev; u16 antenna_diversity; @@ -766,6 +764,7 @@ struct bcm43xx_private { * This is currently always BCM43xx_BUSTYPE_PCI */ u8 bustype; + u64 dma_mask; u16 board_vendor; u16 board_type; diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c index 978ed09..6e0dc76 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c @@ -145,16 +145,14 @@ dma_addr_t map_descbuffer(struct bcm43xx int tx) { dma_addr_t dmaaddr; + int direction = PCI_DMA_FROMDEVICE; - if (tx) { - dmaaddr = dma_map_single(&ring->bcm->pci_dev->dev, - buf, len, - DMA_TO_DEVICE); - } else { - dmaaddr = dma_map_single(&ring->bcm->pci_dev->dev, + if (tx) + direction = PCI_DMA_TODEVICE; + + dmaaddr = pci_map_single(ring->bcm->pci_dev, buf, len, - DMA_FROM_DEVICE); - } + direction); return dmaaddr; } @@ -166,13 +164,13 @@ void unmap_descbuffer(struct bcm43xx_dma int tx) { if (tx) { - dma_unmap_single(&ring->bcm->pci_dev->dev, + pci_unmap_single(ring->bcm->pci_dev, addr, len, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); } else { - dma_unmap_single(&ring->bcm->pci_dev->dev, + pci_unmap_single(ring->bcm->pci_dev, addr, len, - DMA_FROM_DEVICE); + PCI_DMA_FROMDEVICE); } } @@ -183,8 +181,8 @@ void sync_descbuffer_for_cpu(struct bcm4 { assert(!ring->tx); - dma_sync_single_for_cpu(&ring->bcm->pci_dev->dev, - addr, len, DMA_FROM_DEVICE); + pci_dma_sync_single_for_cpu(ring->bcm->pci_dev, + addr, len, PCI_DMA_FROMDEVICE); } static inline @@ -194,8 +192,8 @@ void sync_descbuffer_for_device(struct b { assert(!ring->tx); - dma_sync_single_for_device(&ring->bcm->pci_dev->dev, - addr, len, DMA_FROM_DEVICE); + pci_dma_sync_single_for_cpu(ring->bcm->pci_dev, + addr, len, PCI_DMA_TODEVICE); } /* Unmap and free a descriptor buffer. */ @@ -214,17 +212,53 @@ void free_descriptor_buffer(struct bcm43 static int alloc_ringmemory(struct bcm43xx_dmaring *ring) { - struct device *dev = &(ring->bcm->pci_dev->dev); - - ring->descbase = dma_alloc_coherent(dev, BCM43xx_DMA_RINGMEMSIZE, - &(ring->dmabase), GFP_KERNEL); + ring->descbase = pci_alloc_consistent(ring->bcm->pci_dev, BCM43xx_DMA_RINGMEMSIZE, + &(ring->dmabase)); if (!ring->descbase) { - printk(KERN_ERR PFX "DMA ringmemory allocation failed\n"); - return -ENOMEM; + /* Allocation may have failed due to pci_alloc_consistent + insisting on use of GFP_DMA, which is more restrictive + than necessary... */ + struct dma_desc *rx_ring; + dma_addr_t rx_ring_dma; + + rx_ring = kzalloc(BCM43xx_DMA_RINGMEMSIZE, GFP_KERNEL); + if (!rx_ring) + goto out_err; + + rx_ring_dma = pci_map_single(ring->bcm->pci_dev, rx_ring, + BCM43xx_DMA_RINGMEMSIZE, + PCI_DMA_BIDIRECTIONAL); + + if (pci_dma_mapping_error(rx_ring_dma) || + rx_ring_dma + BCM43xx_DMA_RINGMEMSIZE > ring->bcm->dma_mask) { + /* Sigh... */ + if (!pci_dma_mapping_error(rx_ring_dma)) + pci_unmap_single(ring->bcm->pci_dev, + rx_ring_dma, BCM43xx_DMA_RINGMEMSIZE, + PCI_DMA_BIDIRECTIONAL); + rx_ring_dma = pci_map_single(ring->bcm->pci_dev, + rx_ring, BCM43xx_DMA_RINGMEMSIZE, + PCI_DMA_BIDIRECTIONAL); + if (pci_dma_mapping_error(rx_ring_dma) || + rx_ring_dma + BCM43xx_DMA_RINGMEMSIZE > ring->bcm->dma_mask) { + assert(0); + if (!pci_dma_mapping_error(rx_ring_dma)) + pci_unmap_single(ring->bcm->pci_dev, + rx_ring_dma, BCM43xx_DMA_RINGMEMSIZE, + PCI_DMA_BIDIRECTIONAL); + goto out_err; + } + } + + ring->descbase = rx_ring; + ring->dmabase = rx_ring_dma; } memset(ring->descbase, 0, BCM43xx_DMA_RINGMEMSIZE); return 0; +out_err: + printk(KERN_ERR PFX "DMA ringmemory allocation failed\n"); + return -ENOMEM; } static void free_ringmemory(struct bcm43xx_dmaring *ring) @@ -407,6 +441,29 @@ static int setup_rx_descbuffer(struct bc if (unlikely(!skb)) return -ENOMEM; dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0); + /* This hardware bug work-around adapted from the b44 driver. + The chip may be unable to do PCI DMA to/from anything above 1GB */ + if (pci_dma_mapping_error(dmaaddr) || + dmaaddr + ring->rx_buffersize > ring->bcm->dma_mask) { + /* This one has 30-bit addressing... */ + if (!pci_dma_mapping_error(dmaaddr)) + pci_unmap_single(ring->bcm->pci_dev, + dmaaddr, ring->rx_buffersize, + PCI_DMA_FROMDEVICE); + dev_kfree_skb_any(skb); + skb = __dev_alloc_skb(ring->rx_buffersize,GFP_DMA); + if (skb == NULL) + return -ENOMEM; + dmaaddr = pci_map_single(ring->bcm->pci_dev, + skb->data, ring->rx_buffersize, + PCI_DMA_FROMDEVICE); + if (pci_dma_mapping_error(dmaaddr) || + dmaaddr + ring->rx_buffersize > ring->bcm->dma_mask) { + assert(0); + dev_kfree_skb_any(skb); + return -ENOMEM; + } + } meta->skb = skb; meta->dmaaddr = dmaaddr; skb->dev = ring->bcm->net_dev; @@ -636,8 +693,10 @@ #endif err = dmacontroller_setup(ring); if (err) goto err_free_ringmemory; + return ring; out: + printk(KERN_ERR PFX "Error in bcm43xx_setup_dmaring\n"); return ring; err_free_ringmemory: @@ -705,30 +764,16 @@ int bcm43xx_dma_init(struct bcm43xx_priv struct bcm43xx_dmaring *ring; int err = -ENOMEM; int dma64 = 0; - u64 mask = bcm43xx_get_supported_dma_mask(bcm); - int nobits; - if (mask == DMA_64BIT_MASK) { + bcm->dma_mask = bcm43xx_get_supported_dma_mask(bcm); + if (bcm->dma_mask == DMA_64BIT_MASK) dma64 = 1; - nobits = 64; - } else if (mask == DMA_32BIT_MASK) - nobits = 32; - else - nobits = 30; - err = pci_set_dma_mask(bcm->pci_dev, mask); - err |= pci_set_consistent_dma_mask(bcm->pci_dev, mask); - if (err) { -#ifdef CONFIG_BCM43XX_PIO - printk(KERN_WARNING PFX "DMA not supported on this device." - " Falling back to PIO.\n"); - bcm->__using_pio = 1; - return -ENOSYS; -#else - printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. " - "Please recompile the driver with PIO support.\n"); - return -ENODEV; -#endif /* CONFIG_BCM43XX_PIO */ - } + err = pci_set_dma_mask(bcm->pci_dev, bcm->dma_mask); + if (err) + goto no_dma; + err = pci_set_consistent_dma_mask(bcm->pci_dev, bcm->dma_mask); + if (err) + goto no_dma; /* setup TX DMA channels. */ ring = bcm43xx_setup_dmaring(bcm, 0, 1, dma64); @@ -774,7 +819,9 @@ #endif /* CONFIG_BCM43XX_PIO */ dma->rx_ring3 = ring; } - dprintk(KERN_INFO PFX "%d-bit DMA initialized\n", nobits); + dprintk(KERN_INFO PFX "%d-bit DMA initialized\n", + (bcm->dma_mask == DMA_64BIT_MASK) ? 64 : + (bcm->dma_mask == DMA_32BIT_MASK) ? 32 : 30); err = 0; out: return err; @@ -800,7 +847,17 @@ err_destroy_tx1: err_destroy_tx0: bcm43xx_destroy_dmaring(dma->tx_ring0); dma->tx_ring0 = NULL; - goto out; +no_dma: +#ifdef CONFIG_BCM43XX_PIO + printk(KERN_WARNING PFX "DMA not supported on this device." + " Falling back to PIO.\n"); + bcm->__using_pio = 1; + return -ENOSYS; +#else + printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. " + "Please recompile the driver with PIO support.\n"); + return -ENODEV; +#endif /* CONFIG_BCM43XX_PIO */ } /* Generate a cookie for the TX header. */ @@ -905,6 +962,7 @@ static void dma_tx_fragment(struct bcm43 struct bcm43xx_dmadesc_generic *desc; struct bcm43xx_dmadesc_meta *meta; dma_addr_t dmaaddr; + struct sk_buff *bounce_skb; assert(skb_shinfo(skb)->nr_frags == 0); @@ -924,9 +982,28 @@ static void dma_tx_fragment(struct bcm43 skb->len - sizeof(struct bcm43xx_txhdr), (cur_frag == 0), generate_cookie(ring, slot)); + dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); + if (dma_mapping_error(dmaaddr) || dmaaddr + skb->len > ring->bcm->dma_mask) { + /* chip cannot handle DMA to/from > 1GB, use bounce buffer (copied from b44 driver) */ + if (!dma_mapping_error(dmaaddr)) + unmap_descbuffer(ring, dmaaddr, skb->len, 1); + bounce_skb = __dev_alloc_skb(skb->len, GFP_ATOMIC|GFP_DMA); + if (!bounce_skb) + return; + dmaaddr = map_descbuffer(ring, bounce_skb->data, bounce_skb->len, 1); + if (dma_mapping_error(dmaaddr) || dmaaddr + skb->len > ring->bcm->dma_mask) { + if (!dma_mapping_error(dmaaddr)) + unmap_descbuffer(ring, dmaaddr, skb->len, 1); + dev_kfree_skb_any(bounce_skb); + assert(0); + return; + } + memcpy(skb_put(bounce_skb, skb->len), skb->data, skb->len); + dev_kfree_skb_any(skb); + skb = bounce_skb; + } meta->skb = skb; - dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); meta->dmaaddr = dmaaddr; fill_descriptor(ring, desc, dmaaddr, diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c index ad8e569..f2b8dba 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c @@ -325,6 +325,21 @@ void bcm43xx_ilt_write(struct bcm43xx_pr } } +void bcm43xx_ilt_write32(struct bcm43xx_private *bcm, u16 offset, u32 val) +{ + if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) { + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, offset); + mmiowb(); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA2, (val & 0xFFFF0000) >> 16); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, val & 0x0000FFFF); + } else { + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_CTRL, offset); + mmiowb(); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA2, (val & 0xFFFF0000) >> 16); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA1, val & 0x0000FFFF); + } +} + u16 bcm43xx_ilt_read(struct bcm43xx_private *bcm, u16 offset) { if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) { diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h index 464521a..d7eaf5f 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h @@ -27,6 +27,7 @@ extern const u16 bcm43xx_ilt_sigmasqr2[B void bcm43xx_ilt_write(struct bcm43xx_private *bcm, u16 offset, u16 val); +void bcm43xx_ilt_write32(struct bcm43xx_private *bcm, u16 offset, u32 val); u16 bcm43xx_ilt_read(struct bcm43xx_private *bcm, u16 offset); #endif /* BCM43xx_ILT_H_ */ diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index 91b752e..e5336fa 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -95,13 +95,9 @@ static int modparam_noleds; module_param_named(noleds, modparam_noleds, int, 0444); MODULE_PARM_DESC(noleds, "Turn off all LED activity"); -#ifdef CONFIG_BCM43XX_DEBUG static char modparam_fwpostfix[64]; module_param_string(fwpostfix, modparam_fwpostfix, 64, 0444); -MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for debugging."); -#else -# define modparam_fwpostfix "" -#endif /* CONFIG_BCM43XX_DEBUG*/ +MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for using multiple firmware image versions."); /* If you want to debug with just a single device, enable this, @@ -855,8 +851,6 @@ #endif value = sprom[BCM43xx_SPROM_ETHPHY]; bcm->sprom.et0phyaddr = (value & 0x001F); bcm->sprom.et1phyaddr = (value & 0x03E0) >> 5; - bcm->sprom.et0mdcport = (value & (1 << 14)) >> 14; - bcm->sprom.et1mdcport = (value & (1 << 15)) >> 15; /* boardrev, antennas, locale */ value = sprom[BCM43xx_SPROM_BOARDREV]; @@ -1453,12 +1447,10 @@ static void handle_irq_transmit_status(s bcm43xx_debugfs_log_txstat(bcm, &stat); - if (stat.flags & BCM43xx_TXSTAT_FLAG_IGNORE) + if (stat.flags & BCM43xx_TXSTAT_FLAG_AMPDU) + continue; + if (stat.flags & BCM43xx_TXSTAT_FLAG_INTER) continue; - if (!(stat.flags & BCM43xx_TXSTAT_FLAG_ACK)) { - //TODO: packet was not acked (was lost) - } - //TODO: There are more (unknown) flags to test. see bcm43xx_main.h if (bcm43xx_using_pio(bcm)) bcm43xx_pio_handle_xmitstatus(bcm, &stat); @@ -2980,8 +2972,10 @@ static int bcm43xx_chipset_attach(struct err = bcm43xx_pctl_set_crystal(bcm, 1); if (err) goto out; - bcm43xx_pci_read_config16(bcm, PCI_STATUS, &pci_status); - bcm43xx_pci_write_config16(bcm, PCI_STATUS, pci_status & ~PCI_STATUS_SIG_TARGET_ABORT); + err = bcm43xx_pci_read_config16(bcm, PCI_STATUS, &pci_status); + if (err) + goto out; + err = bcm43xx_pci_write_config16(bcm, PCI_STATUS, pci_status & ~PCI_STATUS_SIG_TARGET_ABORT); out: return err; @@ -3680,7 +3674,7 @@ static int bcm43xx_read_phyinfo(struct b { struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm); u16 value; - u8 phy_version; + u8 phy_analog; u8 phy_type; u8 phy_rev; int phy_rev_ok = 1; @@ -3688,12 +3682,12 @@ static int bcm43xx_read_phyinfo(struct b value = bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_VER); - phy_version = (value & 0xF000) >> 12; + phy_analog = (value & 0xF000) >> 12; phy_type = (value & 0x0F00) >> 8; phy_rev = (value & 0x000F); - dprintk(KERN_INFO PFX "Detected PHY: Version: %x, Type %x, Revision %x\n", - phy_version, phy_type, phy_rev); + dprintk(KERN_INFO PFX "Detected PHY: Analog: %x, Type %x, Revision %x\n", + phy_analog, phy_type, phy_rev); switch (phy_type) { case BCM43xx_PHYTYPE_A: @@ -3736,7 +3730,7 @@ static int bcm43xx_read_phyinfo(struct b phy_rev); } - phy->version = phy_version; + phy->analog = phy_analog; phy->type = phy_type; phy->rev = phy_rev; if ((phy_type == BCM43xx_PHYTYPE_B) || (phy_type == BCM43xx_PHYTYPE_G)) { @@ -3778,12 +3772,18 @@ static int bcm43xx_attach_board(struct b } net_dev->base_addr = (unsigned long)bcm->mmio_addr; - bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_VENDOR_ID, + err = bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_VENDOR_ID, &bcm->board_vendor); - bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_ID, + if (err) + goto err_iounmap; + err = bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_ID, &bcm->board_type); - bcm43xx_pci_read_config16(bcm, PCI_REVISION_ID, + if (err) + goto err_iounmap; + err = bcm43xx_pci_read_config16(bcm, PCI_REVISION_ID, &bcm->board_revision); + if (err) + goto err_iounmap; err = bcm43xx_chipset_attach(bcm); if (err) @@ -3874,6 +3874,7 @@ err_pci_release: pci_release_regions(pci_dev); err_pci_disable: pci_disable_device(pci_dev); + printk(KERN_ERR PFX "Unable to attach board\n"); goto out; } diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c index 52ce2a9..3a5c9c2 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c @@ -205,8 +205,8 @@ static void bcm43xx_phy_init_pctl(struct (bcm->board_type == 0x0416)) return; - bcm43xx_write16(bcm, 0x03E6, bcm43xx_read16(bcm, 0x03E6) & 0xFFDF); bcm43xx_phy_write(bcm, 0x0028, 0x8018); + bcm43xx_write16(bcm, 0x03E6, bcm43xx_read16(bcm, 0x03E6) & 0xFFDF); if (phy->type == BCM43xx_PHYTYPE_G) { if (!phy->connected) @@ -317,6 +317,13 @@ static void bcm43xx_phy_agcsetup(struct bcm43xx_ilt_write(bcm, offset + 0x0801, 7); bcm43xx_ilt_write(bcm, offset + 0x0802, 16); bcm43xx_ilt_write(bcm, offset + 0x0803, 28); + + if (phy->rev >= 6) { + bcm43xx_phy_write(bcm, 0x0426, (bcm43xx_phy_read(bcm, 0x0426) + & 0xFFFC)); + bcm43xx_phy_write(bcm, 0x0426, (bcm43xx_phy_read(bcm, 0x0426) + & 0xEFFF)); + } } static void bcm43xx_phy_setupg(struct bcm43xx_private *bcm) @@ -337,7 +344,7 @@ static void bcm43xx_phy_setupg(struct bc for (i = 0; i < BCM43xx_ILT_NOISEG1_SIZE; i++) bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noiseg1[i]); for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++) - bcm43xx_ilt_write(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]); + bcm43xx_ilt_write32(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]); } else { /* nrssi values are signed 6-bit values. Not sure why we write 0x7654 here... */ bcm43xx_nrssi_hw_write(bcm, 0xBA98, (s16)0x7654); @@ -377,7 +384,7 @@ static void bcm43xx_phy_setupg(struct bc if (phy->rev == 1) { for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++) - bcm43xx_ilt_write(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]); + bcm43xx_ilt_write32(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]); for (i = 0; i < 4; i++) { bcm43xx_ilt_write(bcm, 0x5404 + i, 0x0020); bcm43xx_ilt_write(bcm, 0x5408 + i, 0x0020); @@ -500,10 +507,10 @@ static void bcm43xx_phy_setupa(struct bc for (i = 0; i < BCM43xx_ILT_NOISEA2_SIZE; i++) bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noisea2[i]); for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++) - bcm43xx_ilt_write(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]); + bcm43xx_ilt_write32(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]); bcm43xx_phy_init_noisescaletbl(bcm); for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++) - bcm43xx_ilt_write(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]); + bcm43xx_ilt_write32(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]); break; case 3: for (i = 0; i < 64; i++) @@ -729,19 +736,19 @@ static void bcm43xx_phy_initb5(struct bc struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm); struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm); u16 offset; + u16 value; + u8 old_channel; - if (phy->version == 1 && - radio->version == 0x2050) { + if (phy->analog == 1) bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0050); - } if ((bcm->board_vendor != PCI_VENDOR_ID_BROADCOM) && (bcm->board_type != 0x0416)) { + value = 0x2120; for (offset = 0x00A8 ; offset < 0x00C7; offset++) { - bcm43xx_phy_write(bcm, offset, - (bcm43xx_phy_read(bcm, offset) + 0x2020) - & 0x3F3F); + bcm43xx_phy_write(bcm, offset, value); + value += 0x0202; } } bcm43xx_phy_write(bcm, 0x0035, @@ -750,7 +757,7 @@ static void bcm43xx_phy_initb5(struct bc if (radio->version == 0x2050) bcm43xx_phy_write(bcm, 0x0038, 0x0667); - if (phy->connected) { + if (phy->type == BCM43xx_PHYTYPE_G) { if (radio->version == 0x2050) { bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) @@ -776,7 +783,7 @@ static void bcm43xx_phy_initb5(struct bc bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD) | (1 << 11)); } - if (phy->version == 1 && radio->version == 0x2050) { + if (phy->analog == 1) { bcm43xx_phy_write(bcm, 0x0026, 0xCE00); bcm43xx_phy_write(bcm, 0x0021, 0x3763); bcm43xx_phy_write(bcm, 0x0022, 0x1BC3); @@ -787,14 +794,15 @@ static void bcm43xx_phy_initb5(struct bc bcm43xx_phy_write(bcm, 0x0030, 0x00C6); bcm43xx_write16(bcm, 0x03EC, 0x3F22); - if (phy->version == 1 && radio->version == 0x2050) + if (phy->analog == 1) bcm43xx_phy_write(bcm, 0x0020, 0x3E1C); else bcm43xx_phy_write(bcm, 0x0020, 0x301C); - if (phy->version == 0) + if (phy->analog == 0) bcm43xx_write16(bcm, 0x03E4, 0x3000); + old_channel = radio->channel; /* Force to channel 7, even if not supported. */ bcm43xx_radio_selectchannel(bcm, 7, 0); @@ -816,11 +824,11 @@ static void bcm43xx_phy_initb5(struct bc bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0007); - bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0); + bcm43xx_radio_selectchannel(bcm, old_channel, 0); bcm43xx_phy_write(bcm, 0x0014, 0x0080); bcm43xx_phy_write(bcm, 0x0032, 0x00CA); - bcm43xx_phy_write(bcm, 0x88A3, 0x002A); + bcm43xx_phy_write(bcm, 0x002A, 0x88A3); bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF); @@ -835,61 +843,24 @@ static void bcm43xx_phy_initb6(struct bc struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm); struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm); u16 offset, val; + u8 old_channel; bcm43xx_phy_write(bcm, 0x003E, 0x817A); bcm43xx_radio_write16(bcm, 0x007A, (bcm43xx_radio_read16(bcm, 0x007A) | 0x0058)); - if ((radio->manufact == 0x17F) && - (radio->version == 0x2050) && - (radio->revision == 3 || - radio->revision == 4 || - radio->revision == 5)) { - bcm43xx_radio_write16(bcm, 0x0051, 0x001F); - bcm43xx_radio_write16(bcm, 0x0052, 0x0040); - bcm43xx_radio_write16(bcm, 0x0053, 0x005B); - bcm43xx_radio_write16(bcm, 0x0054, 0x0098); + if (radio->revision == 4 || + radio->revision == 5) { + bcm43xx_radio_write16(bcm, 0x0051, 0x0037); + bcm43xx_radio_write16(bcm, 0x0052, 0x0070); + bcm43xx_radio_write16(bcm, 0x0053, 0x00B3); + bcm43xx_radio_write16(bcm, 0x0054, 0x009B); bcm43xx_radio_write16(bcm, 0x005A, 0x0088); bcm43xx_radio_write16(bcm, 0x005B, 0x0088); bcm43xx_radio_write16(bcm, 0x005D, 0x0088); bcm43xx_radio_write16(bcm, 0x005E, 0x0088); bcm43xx_radio_write16(bcm, 0x007D, 0x0088); } - if ((radio->manufact == 0x17F) && - (radio->version == 0x2050) && - (radio->revision == 6)) { - bcm43xx_radio_write16(bcm, 0x0051, 0x0000); - bcm43xx_radio_write16(bcm, 0x0052, 0x0040); - bcm43xx_radio_write16(bcm, 0x0053, 0x00B7); - bcm43xx_radio_write16(bcm, 0x0054, 0x0098); - bcm43xx_radio_write16(bcm, 0x005A, 0x0088); - bcm43xx_radio_write16(bcm, 0x005B, 0x008B); - bcm43xx_radio_write16(bcm, 0x005C, 0x00B5); - bcm43xx_radio_write16(bcm, 0x005D, 0x0088); - bcm43xx_radio_write16(bcm, 0x005E, 0x0088); - bcm43xx_radio_write16(bcm, 0x007D, 0x0088); - bcm43xx_radio_write16(bcm, 0x007C, 0x0001); - bcm43xx_radio_write16(bcm, 0x007E, 0x0008); - } - if ((radio->manufact == 0x17F) && - (radio->version == 0x2050) && - (radio->revision == 7)) { - bcm43xx_radio_write16(bcm, 0x0051, 0x0000); - bcm43xx_radio_write16(bcm, 0x0052, 0x0040); - bcm43xx_radio_write16(bcm, 0x0053, 0x00B7); - bcm43xx_radio_write16(bcm, 0x0054, 0x0098); - bcm43xx_radio_write16(bcm, 0x005A, 0x0088); - bcm43xx_radio_write16(bcm, 0x005B, 0x00A8); - bcm43xx_radio_write16(bcm, 0x005C, 0x0075); - bcm43xx_radio_write16(bcm, 0x005D, 0x00F5); - bcm43xx_radio_write16(bcm, 0x005E, 0x00B8); - bcm43xx_radio_write16(bcm, 0x007D, 0x00E8); - bcm43xx_radio_write16(bcm, 0x007C, 0x0001); - bcm43xx_radio_write16(bcm, 0x007E, 0x0008); - bcm43xx_radio_write16(bcm, 0x007B, 0x0000); - } - if ((radio->manufact == 0x17F) && - (radio->version == 0x2050) && - (radio->revision == 8)) { + if (radio->revision == 8) { bcm43xx_radio_write16(bcm, 0x0051, 0x0000); bcm43xx_radio_write16(bcm, 0x0052, 0x0040); bcm43xx_radio_write16(bcm, 0x0053, 0x00B7); @@ -933,20 +904,26 @@ static void bcm43xx_phy_initb6(struct bc bcm43xx_phy_read(bcm, 0x0802) | 0x0100); bcm43xx_phy_write(bcm, 0x042B, bcm43xx_phy_read(bcm, 0x042B) | 0x2000); + bcm43xx_phy_write(bcm, 0x5B, 0x0000); + bcm43xx_phy_write(bcm, 0x5C, 0x0000); } - /* Force to channel 7, even if not supported. */ - bcm43xx_radio_selectchannel(bcm, 7, 0); + old_channel = radio->channel; + if (old_channel >= 8) + bcm43xx_radio_selectchannel(bcm, 1, 0); + else + bcm43xx_radio_selectchannel(bcm, 13, 0); bcm43xx_radio_write16(bcm, 0x0050, 0x0020); bcm43xx_radio_write16(bcm, 0x0050, 0x0023); udelay(40); - bcm43xx_radio_write16(bcm, 0x007C, (bcm43xx_radio_read16(bcm, 0x007C) | 0x0002)); - bcm43xx_radio_write16(bcm, 0x0050, 0x0020); - if (radio->manufact == 0x17F && - radio->version == 0x2050 && - radio->revision <= 2) { + if (radio->revision < 6 || radio-> revision == 8) { + bcm43xx_radio_write16(bcm, 0x007C, (bcm43xx_radio_read16(bcm, 0x007C) + | 0x0002)); bcm43xx_radio_write16(bcm, 0x0050, 0x0020); + } + if (radio->revision <= 2) { + bcm43xx_radio_write16(bcm, 0x007C, 0x0020); bcm43xx_radio_write16(bcm, 0x005A, 0x0070); bcm43xx_radio_write16(bcm, 0x005B, 0x007B); bcm43xx_radio_write16(bcm, 0x005C, 0x00B0); @@ -954,46 +931,41 @@ static void bcm43xx_phy_initb6(struct bc bcm43xx_radio_write16(bcm, 0x007A, (bcm43xx_radio_read16(bcm, 0x007A) & 0x00F8) | 0x0007); - bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0); + bcm43xx_radio_selectchannel(bcm, old_channel, 0); bcm43xx_phy_write(bcm, 0x0014, 0x0200); - if (radio->version == 0x2050){ - if (radio->revision == 3 || - radio->revision == 4 || - radio->revision == 5) - bcm43xx_phy_write(bcm, 0x002A, 0x8AC0); - else - bcm43xx_phy_write(bcm, 0x002A, 0x88C2); - } + if (radio->revision >= 6) + bcm43xx_phy_write(bcm, 0x002A, 0x88C2); + else + bcm43xx_phy_write(bcm, 0x002A, 0x8AC0); bcm43xx_phy_write(bcm, 0x0038, 0x0668); bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF); - if (radio->version == 0x2050) { - if (radio->revision == 3 || - radio->revision == 4 || - radio->revision == 5) - bcm43xx_phy_write(bcm, 0x005D, bcm43xx_phy_read(bcm, 0x005D) | 0x0003); - else if (radio->revision <= 2) - bcm43xx_radio_write16(bcm, 0x005D, 0x000D); - } + if (radio->revision <= 5) + bcm43xx_phy_write(bcm, 0x005D, bcm43xx_phy_read(bcm, 0x005D) | 0x0003); + if (radio->revision <= 2) + bcm43xx_radio_write16(bcm, 0x005D, 0x000D); - if (phy->rev == 4) - bcm43xx_phy_write(bcm, 0x0002, (bcm43xx_phy_read(bcm, 0x0002) & 0xFFC0) | 0x0004); - else + if (phy->analog == 4){ bcm43xx_write16(bcm, 0x03E4, 0x0009); + bcm43xx_phy_write(bcm, 0x61, bcm43xx_phy_read(bcm, 0x61) & 0xFFF); + } else { + bcm43xx_phy_write(bcm, 0x0002, (bcm43xx_phy_read(bcm, 0x0002) & 0xFFC0) | 0x0004); + } + if (phy->type == BCM43xx_PHYTYPE_G) + bcm43xx_write16(bcm, 0x03E6, 0x0); if (phy->type == BCM43xx_PHYTYPE_B) { bcm43xx_write16(bcm, 0x03E6, 0x8140); bcm43xx_phy_write(bcm, 0x0016, 0x0410); bcm43xx_phy_write(bcm, 0x0017, 0x0820); bcm43xx_phy_write(bcm, 0x0062, 0x0007); (void) bcm43xx_radio_calibrationvalue(bcm); - bcm43xx_phy_lo_b_measure(bcm); + bcm43xx_phy_lo_g_measure(bcm); if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) { bcm43xx_calc_nrssi_slope(bcm); bcm43xx_calc_nrssi_threshold(bcm); } bcm43xx_phy_init_pctl(bcm); - } else - bcm43xx_write16(bcm, 0x03E6, 0x0); + } } static void bcm43xx_calc_loopback_gain(struct bcm43xx_private *bcm) @@ -1063,7 +1035,7 @@ static void bcm43xx_calc_loopback_gain(s bcm43xx_phy_write(bcm, 0x005A, 0x0780); bcm43xx_phy_write(bcm, 0x0059, 0xC810); bcm43xx_phy_write(bcm, 0x0058, 0x000D); - if (phy->version == 0) { + if (phy->analog == 0) { bcm43xx_phy_write(bcm, 0x0003, 0x0122); } else { bcm43xx_phy_write(bcm, 0x000A, @@ -1205,27 +1177,30 @@ static void bcm43xx_phy_initg(struct bcm if (phy->rev >= 2) { bcm43xx_phy_write(bcm, 0x0814, 0x0000); bcm43xx_phy_write(bcm, 0x0815, 0x0000); - if (phy->rev == 2) - bcm43xx_phy_write(bcm, 0x0811, 0x0000); - else if (phy->rev >= 3) - bcm43xx_phy_write(bcm, 0x0811, 0x0400); + } + if (phy->rev == 2) { + bcm43xx_phy_write(bcm, 0x0811, 0x0000); bcm43xx_phy_write(bcm, 0x0015, 0x00C0); - if (phy->connected) { - tmp = bcm43xx_phy_read(bcm, 0x0400) & 0xFF; - if (tmp < 6) { - bcm43xx_phy_write(bcm, 0x04C2, 0x1816); - bcm43xx_phy_write(bcm, 0x04C3, 0x8006); - if (tmp != 3) { - bcm43xx_phy_write(bcm, 0x04CC, - (bcm43xx_phy_read(bcm, 0x04CC) - & 0x00FF) | 0x1F00); - } + } + if (phy->rev >= 3) { + bcm43xx_phy_write(bcm, 0x0811, 0x0400); + bcm43xx_phy_write(bcm, 0x0015, 0x00C0); + } + if (phy->connected) { + tmp = bcm43xx_phy_read(bcm, 0x0400) & 0xFF; + if (tmp < 6) { + bcm43xx_phy_write(bcm, 0x04C2, 0x1816); + bcm43xx_phy_write(bcm, 0x04C3, 0x8006); + if (tmp != 3) { + bcm43xx_phy_write(bcm, 0x04CC, + (bcm43xx_phy_read(bcm, 0x04CC) + & 0x00FF) | 0x1F00); } } } if (phy->rev < 3 && phy->connected) bcm43xx_phy_write(bcm, 0x047E, 0x0078); - if (phy->rev >= 6 && phy->rev <= 8) { + if (radio->revision == 8) { bcm43xx_phy_write(bcm, 0x0801, bcm43xx_phy_read(bcm, 0x0801) | 0x0080); bcm43xx_phy_write(bcm, 0x043E, bcm43xx_phy_read(bcm, 0x043E) | 0x0004); } @@ -1638,14 +1613,14 @@ void bcm43xx_phy_set_baseband_attenuatio struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm); u16 value; - if (phy->version == 0) { + if (phy->analog == 0) { value = (bcm43xx_read16(bcm, 0x03E6) & 0xFFF0); value |= (baseband_attenuation & 0x000F); bcm43xx_write16(bcm, 0x03E6, value); return; } - if (phy->version > 1) { + if (phy->analog > 1) { value = bcm43xx_phy_read(bcm, 0x0060) & ~0x003C; value |= (baseband_attenuation << 2) & 0x003C; } else { diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c index bb9c484..3fbb3c6 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c @@ -1393,11 +1393,12 @@ u16 bcm43xx_radio_init2050(struct bcm43x backup[12] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT); // Initialization - if (phy->version == 0) { + if (phy->analog == 0) { bcm43xx_write16(bcm, 0x03E6, 0x0122); } else { - if (phy->version >= 2) - bcm43xx_write16(bcm, 0x03E6, 0x0040); + if (phy->analog >= 2) + bcm43xx_phy_write(bcm, 0x0003, (bcm43xx_phy_read(bcm, 0x0003) + & 0xFFBF) | 0x0040); bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, (bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT) | 0x2000)); } @@ -1405,7 +1406,7 @@ u16 bcm43xx_radio_init2050(struct bcm43x ret = bcm43xx_radio_calibrationvalue(bcm); if (phy->type == BCM43xx_PHYTYPE_B) - bcm43xx_radio_write16(bcm, 0x0078, 0x0003); + bcm43xx_radio_write16(bcm, 0x0078, 0x0026); bcm43xx_phy_write(bcm, 0x0015, 0xBFAF); bcm43xx_phy_write(bcm, 0x002B, 0x1403); @@ -1416,7 +1417,7 @@ u16 bcm43xx_radio_init2050(struct bcm43x (bcm43xx_radio_read16(bcm, 0x0051) | 0x0004)); bcm43xx_radio_write16(bcm, 0x0052, 0x0000); bcm43xx_radio_write16(bcm, 0x0043, - bcm43xx_radio_read16(bcm, 0x0043) | 0x0009); + (bcm43xx_radio_read16(bcm, 0x0043) & 0xFFF0) | 0x0009); bcm43xx_phy_write(bcm, 0x0058, 0x0000); for (i = 0; i < 16; i++) { @@ -1488,7 +1489,7 @@ u16 bcm43xx_radio_init2050(struct bcm43x bcm43xx_phy_write(bcm, 0x0059, backup[17]); bcm43xx_phy_write(bcm, 0x0058, backup[18]); bcm43xx_write16(bcm, 0x03E6, backup[11]); - if (phy->version != 0) + if (phy->analog != 0) bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, backup[12]); bcm43xx_phy_write(bcm, 0x0035, backup[10]); bcm43xx_radio_selectchannel(bcm, radio->channel, 1); diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c index a659442..6961be6 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c @@ -261,22 +261,22 @@ static int bcm43xx_wx_get_rangeparams(st if (phy->type == BCM43xx_PHYTYPE_A || phy->type == BCM43xx_PHYTYPE_G) { range->num_bitrates = 8; - range->bitrate[i++] = IEEE80211_OFDM_RATE_6MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_9MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_12MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_18MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_24MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_36MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_48MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_54MB; + range->bitrate[i++] = IEEE80211_OFDM_RATE_6MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_9MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_12MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_18MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_24MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_36MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_48MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_54MB * 500000; } if (phy->type == BCM43xx_PHYTYPE_B || phy->type == BCM43xx_PHYTYPE_G) { range->num_bitrates += 4; - range->bitrate[i++] = IEEE80211_CCK_RATE_1MB; - range->bitrate[i++] = IEEE80211_CCK_RATE_2MB; - range->bitrate[i++] = IEEE80211_CCK_RATE_5MB; - range->bitrate[i++] = IEEE80211_CCK_RATE_11MB; + range->bitrate[i++] = IEEE80211_CCK_RATE_1MB * 500000; + range->bitrate[i++] = IEEE80211_CCK_RATE_2MB * 500000; + range->bitrate[i++] = IEEE80211_CCK_RATE_5MB * 500000; + range->bitrate[i++] = IEEE80211_CCK_RATE_11MB * 500000; } geo = ieee80211_get_geo(bcm->ieee); @@ -286,7 +286,7 @@ static int bcm43xx_wx_get_rangeparams(st if (j == IW_MAX_FREQUENCIES) break; range->freq[j].i = j + 1; - range->freq[j].m = geo->a[i].freq;//FIXME? + range->freq[j].m = geo->a[i].freq * 100000; range->freq[j].e = 1; j++; } @@ -294,7 +294,7 @@ static int bcm43xx_wx_get_rangeparams(st if (j == IW_MAX_FREQUENCIES) break; range->freq[j].i = j + 1; - range->freq[j].m = geo->bg[i].freq;//FIXME? + range->freq[j].m = geo->bg[i].freq * 100000; range->freq[j].e = 1; j++; } diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h index 2aed19e..9ecf2bf 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h @@ -137,14 +137,8 @@ struct bcm43xx_xmitstatus { u16 unknown; //FIXME }; -#define BCM43xx_TXSTAT_FLAG_ACK 0x01 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x02 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x04 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x08 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x10 -#define BCM43xx_TXSTAT_FLAG_IGNORE 0x20 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x40 -//TODO #define BCM43xx_TXSTAT_FLAG_??? 0x80 +#define BCM43xx_TXSTAT_FLAG_AMPDU 0x10 +#define BCM43xx_TXSTAT_FLAG_INTER 0x20 u8 bcm43xx_plcp_get_ratecode_cck(const u8 bitrate); u8 bcm43xx_plcp_get_ratecode_ofdm(const u8 bitrate); jwltest-bcm43xx-workqueue-undo.patch: bcm43xx.h | 2 +- bcm43xx_main.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) --- NEW FILE jwltest-bcm43xx-workqueue-undo.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h.orig 2007-02-14 17:43:25.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h 2007-02-14 17:44:27.000000000 -0500 @@ -818,7 +818,7 @@ struct bcm43xx_private { struct tasklet_struct isr_tasklet; /* Periodic tasks */ - struct delayed_work periodic_work; + struct work_struct periodic_work; unsigned int periodic_state; struct work_struct restart_work; --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig 2007-02-14 17:43:25.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2007-02-14 17:44:27.000000000 -0500 @@ -3212,10 +3212,9 @@ static void do_periodic_work(struct bcm4 schedule_delayed_work(&bcm->periodic_work, HZ * 15); } -static void bcm43xx_periodic_work_handler(struct work_struct *work) +static void bcm43xx_periodic_work_handler(void *d) { - struct bcm43xx_private *bcm = - container_of(work, struct bcm43xx_private, periodic_work.work); + struct bcm43xx_private *bcm = d; struct net_device *net_dev = bcm->net_dev; unsigned long flags; u32 savedirqs = 0; @@ -3277,11 +3276,11 @@ void bcm43xx_periodic_tasks_delete(struc void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm) { - struct delayed_work *work = &bcm->periodic_work; + struct work_struct *work = &(bcm->periodic_work); assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED); - INIT_DELAYED_WORK(work, bcm43xx_periodic_work_handler); - schedule_delayed_work(work, 0); + INIT_WORK(work, bcm43xx_periodic_work_handler, bcm); + schedule_work(work); } static void bcm43xx_security_init(struct bcm43xx_private *bcm) @@ -3633,7 +3632,7 @@ static int bcm43xx_init_board(struct bcm bcm43xx_periodic_tasks_setup(bcm); /*FIXME: This should be handled by softmac instead. */ - schedule_delayed_work(&bcm->softmac->associnfo.work, 0); + schedule_work(&bcm->softmac->associnfo.work); out: mutex_unlock(&(bcm)->mutex); @@ -4187,10 +4186,9 @@ static void __devexit bcm43xx_remove_one /* Hard-reset the chip. Do not call this directly. * Use bcm43xx_controller_restart() */ -static void bcm43xx_chip_reset(struct work_struct *work) +static void bcm43xx_chip_reset(void *_bcm) { - struct bcm43xx_private *bcm = - container_of(work, struct bcm43xx_private, restart_work); + struct bcm43xx_private *bcm = _bcm; struct bcm43xx_phyinfo *phy; int err = -ENODEV; @@ -4217,7 +4215,7 @@ void bcm43xx_controller_restart(struct b if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) return; printk(KERN_ERR PFX "Controller RESET (%s) ...\n", reason); - INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset); + INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset, bcm); schedule_work(&bcm->restart_work); } jwltest-iwlwifi-2_6_19-fixup.patch: base.c | 128 +++++++++++++++++++++++++++++++------------------------------- iwlwifi.h | 14 +++--- 2 files changed, 71 insertions(+), 71 deletions(-) --- NEW FILE jwltest-iwlwifi-2_6_19-fixup.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-03-02 15:30:45.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-03-02 15:32:15.000000000 -0500 @@ -253,12 +253,12 @@ static void ipw_rx_queue_free(struct ipw static void ipw_rx_queue_replenish(struct ipw_priv *priv); static int ipw_up(struct ipw_priv *); -static void ipw_bg_up(struct work_struct *work); +static void ipw_bg_up(void *p); static void ipw_down(struct ipw_priv *); -static void ipw_bg_down(struct work_struct *work); +static void ipw_bg_down(void *p); static int ipw_card_show_info(struct ipw_priv *priv); -static void ipw_bg_alive_start(struct work_struct *work); +static void ipw_bg_alive_start(void *p); static int ipw_send_card_state(struct ipw_priv *priv, u32 flags, u8 meta_flag); static void ipw_link_down(struct ipw_priv *priv); @@ -1409,9 +1409,9 @@ static void ipw_setup_activity_timer(str IPW_ACTIVITY_PERIOD); } -static void ipw_bg_activity_timer(struct work_struct *work) +static void ipw_bg_activity_timer(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, activity_timer.work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -3378,9 +3378,9 @@ static void reg_txpower_periodic(struct &priv->thermal_periodic, REG_RECALIB_PERIOD * HZ); } -static void ipw_bg_reg_txpower_periodic(struct work_struct *work) +static void ipw_bg_reg_txpower_periodic(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, thermal_periodic.work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -3780,9 +3780,9 @@ static void ipw_connection_init_rx_confi #define IPW_SCAN_CHECK_WATCHDOG (7 * HZ) -static void ipw_bg_scan_check(struct work_struct *work) +static void ipw_bg_scan_check(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, scan_check.work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -4789,9 +4789,9 @@ static void ipw_init_geos(struct ipw_pri static int ipw_commit_rxon(struct ipw_priv *priv); -static void ipw_bg_post_associate(struct work_struct *work) +static void ipw_bg_post_associate(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, post_associate); + struct ipw_priv *priv = p; struct ieee80211_conf *conf = NULL; if (priv->status & STATUS_EXIT_PENDING) @@ -5077,9 +5077,9 @@ static void ipw_rx_queue_replenish(struc spin_unlock_irqrestore(&priv->lock, flags); } -static void ipw_bg_rx_queue_replenish(struct work_struct *work) +static void ipw_bg_rx_queue_replenish(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, rx_replenish); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -6391,9 +6391,9 @@ static u8 ipw_sync_station(struct ipw_pr return IPW_INVALID_STATION; } -static void ipw_bg_scan_completed(struct work_struct *work) +static void ipw_bg_scan_completed(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, scan_completed); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -6682,9 +6682,9 @@ static void ipw_gather_stats(struct ipw_ IPW_STATS_INTERVAL); } -static void ipw_bg_gather_stats(struct work_struct *work) +static void ipw_bg_gather_stats(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, gather_stats.work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -6922,7 +6922,7 @@ static int ipw_get_channels_for_scan(str return added; } -static void ipw_bg_request_scan(struct work_struct *work) +static void ipw_bg_request_scan(void *p) { struct ipw_host_cmd cmd = { @@ -6930,7 +6930,7 @@ static void ipw_bg_request_scan(struct w .len = sizeof(struct ipw_scan_cmd), .meta.flags = CMD_SIZE_HUGE, }; - struct ipw_priv *priv = container_of(work, struct ipw_priv, request_scan.work); + struct ipw_priv *priv = p; int rc = 0; struct ipw_scan_cmd *scan; struct ieee80211_hw_mode *hw_mode = NULL; @@ -7120,9 +7120,9 @@ static void ipw_bg_request_scan(struct w mutex_unlock(&priv->mutex); } -static void ipw_bg_abort_scan(struct work_struct *work) +static void ipw_bg_abort_scan(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, abort_scan); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -7257,18 +7257,18 @@ static void ipw_qos_activate(struct ipw_ */ } } -static void ipw_bg_qos_activate(struct work_struct *work) +static void ipw_bg_qos_activate(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, qos_activate); + struct ipw_priv *priv = p; mutex_lock(&priv->mutex); ipw_qos_activate(priv, 0); mutex_unlock(&priv->mutex); } -static void ipw_bg_report_work(struct work_struct *work) +static void ipw_bg_report_work(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, report_work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -9480,9 +9480,9 @@ static irqreturn_t ipw_isr(int irq, void return IRQ_NONE; } -static void ipw_bg_rf_kill(struct work_struct *work) +static void ipw_bg_rf_kill(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, rf_kill); + struct ipw_priv *priv = p; wake_up_interruptible(&priv->wait_command_queue); @@ -9547,9 +9547,9 @@ static void ipw_link_up(struct ipw_priv ipw_scan_initiate(priv, 1000); } -static void ipw_bg_update_link_led(struct work_struct *work) +static void ipw_bg_update_link_led(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, update_link_led); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -9557,9 +9557,9 @@ static void ipw_bg_update_link_led(struc ipw_update_link_led(priv); mutex_unlock(&priv->mutex); } -static void ipw_bg_link_up(struct work_struct *work) +static void ipw_bg_link_up(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, link_up); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -9586,9 +9586,9 @@ static void ipw_link_down(struct ipw_pri return; } -static void ipw_bg_link_down(struct work_struct *work) +static void ipw_bg_link_down(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, link_down); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -9597,9 +9597,9 @@ static void ipw_bg_link_down(struct work mutex_unlock(&priv->mutex); } -static void ipw_bg_resume_work(struct work_struct *work) +static void ipw_bg_resume_work(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, resume_work.work); + struct ipw_priv *priv = p; unsigned long flags; mutex_lock(&priv->mutex); @@ -9651,9 +9651,9 @@ static void ipw_bg_resume_work(struct wo } #if 0 -static void ipw_associate_timeout(struct work_struct *work) +static void ipw_associate_timeout(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, associate_timeout.work); + struct ipw_priv *priv = p; mutex_lock(&priv->mutex); @@ -9698,32 +9698,32 @@ static void ipw_setup_deferred_work(stru init_waitqueue_head(&priv->wait_command_queue); - INIT_WORK(&priv->scan_completed, ipw_bg_scan_completed); - INIT_WORK(&priv->rx_replenish, ipw_bg_rx_queue_replenish); - INIT_WORK(&priv->rf_kill, ipw_bg_rf_kill); - INIT_WORK(&priv->up, ipw_bg_up); - INIT_WORK(&priv->down, ipw_bg_down); - INIT_WORK(&priv->abort_scan, ipw_bg_abort_scan); - INIT_WORK(&priv->link_up, ipw_bg_link_up); - INIT_WORK(&priv->update_link_led, ipw_bg_update_link_led); - INIT_WORK(&priv->link_down, ipw_bg_link_down); -// INIT_WORK(&priv->associate_timeout, ipw_associate_timeout); - - INIT_DELAYED_WORK(&priv->alive_start, ipw_bg_alive_start); - INIT_DELAYED_WORK(&priv->scan_check, ipw_bg_scan_check); - INIT_DELAYED_WORK(&priv->request_scan, ipw_bg_request_scan); - INIT_DELAYED_WORK(&priv->gather_stats, ipw_bg_gather_stats); - INIT_DELAYED_WORK(&priv->activity_timer, ipw_bg_activity_timer); - INIT_DELAYED_WORK(&priv->thermal_periodic, ipw_bg_reg_txpower_periodic); - INIT_DELAYED_WORK(&priv->resume_work, ipw_bg_resume_work); + INIT_WORK(&priv->scan_completed, ipw_bg_scan_completed, priv); + INIT_WORK(&priv->rx_replenish, ipw_bg_rx_queue_replenish, priv); + INIT_WORK(&priv->rf_kill, ipw_bg_rf_kill, priv); + INIT_WORK(&priv->up, ipw_bg_up, priv); + INIT_WORK(&priv->down, ipw_bg_down, priv); + INIT_WORK(&priv->abort_scan, ipw_bg_abort_scan, priv); + INIT_WORK(&priv->link_up, ipw_bg_link_up, priv); + INIT_WORK(&priv->update_link_led, ipw_bg_update_link_led, priv); + INIT_WORK(&priv->link_down, ipw_bg_link_down, priv); +// INIT_WORK(&priv->associate_timeout, ipw_associate_timeout, priv); + + INIT_WORK(&priv->alive_start, ipw_bg_alive_start, priv); + INIT_WORK(&priv->scan_check, ipw_bg_scan_check, priv); + INIT_WORK(&priv->request_scan, ipw_bg_request_scan, priv); + INIT_WORK(&priv->gather_stats, ipw_bg_gather_stats, priv); + INIT_WORK(&priv->activity_timer, ipw_bg_activity_timer, priv); + INIT_WORK(&priv->thermal_periodic, ipw_bg_reg_txpower_periodic, priv); + INIT_WORK(&priv->resume_work, ipw_bg_resume_work, priv); /* QoS */ - INIT_WORK(&priv->qos_activate, ipw_bg_qos_activate); + INIT_WORK(&priv->qos_activate, ipw_bg_qos_activate, priv); /* 802.11h */ - INIT_WORK(&priv->report_work, ipw_bg_report_work); + INIT_WORK(&priv->report_work, ipw_bg_report_work, priv); - INIT_WORK(&priv->post_associate, ipw_bg_post_associate); + INIT_WORK(&priv->post_associate, ipw_bg_post_associate, priv); init_timer(&priv->rate_scale_flush); priv->rate_scale_flush.data = (unsigned long)priv; @@ -9890,9 +9890,9 @@ static int ipw_card_remove_notify(struct * this function starts the calibration then start the process * of transfering the card to recieving state */ -static void ipw_bg_alive_start(struct work_struct *work) +static void ipw_bg_alive_start(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, alive_start.work); + struct ipw_priv *priv = p; int rc = 0; int thermal_spin = 0; @@ -10074,9 +10074,9 @@ static int ipw_up(struct ipw_priv *priv) return -EIO; } -static void ipw_bg_up(struct work_struct *work) +static void ipw_bg_up(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, up); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -10183,9 +10183,9 @@ static void ipw_down(struct ipw_priv *pr } -static void ipw_bg_down(struct work_struct *work) +static void ipw_bg_down(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, down); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-03-02 15:30:45.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-03-02 15:32:15.000000000 -0500 @@ -1195,13 +1195,13 @@ struct ipw_priv { struct tasklet_struct irq_tasklet; - struct delayed_work alive_start; - struct delayed_work activity_timer; - struct delayed_work request_scan; - struct delayed_work thermal_periodic; - struct delayed_work gather_stats; - struct delayed_work scan_check; - struct delayed_work resume_work; + struct work_struct alive_start; + struct work_struct activity_timer; + struct work_struct request_scan; + struct work_struct thermal_periodic; + struct work_struct gather_stats; + struct work_struct scan_check; + struct work_struct resume_work; #define IPW_DEFAULT_TX_POWER 0x0F s8 user_txpower_limit; jwltest-iwlwifi.patch: Kconfig | 1 Makefile | 1 iwlwifi/Kconfig | 53 iwlwifi/Makefile | 2 iwlwifi/base.c |13165 +++++++++++++++++++++++++++++++++++++++++++++++++++ iwlwifi/iwlwifi.h | 1307 +++++ iwlwifi/iwlwifi_hw.h | 1875 +++++++ 7 files changed, 16404 insertions(+) --- NEW FILE jwltest-iwlwifi.patch --- --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-03-02 15:30:45.000000000 -0500 @@ -0,0 +1,13165 @@ +/****************************************************************************** + + Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. + + Portions of this file are derived from the ipw3945 project, as well + as portions of the ieee80211 subsystem header files. + + 802.11 status code portion of this file from ethereal-0.10.6: + Copyright 2000, Axis Communications AB + Ethereal - Network traffic analyzer + By Gerald Combs + Copyright 1998 Gerald Combs + + This program is free software; you can redistribute it and/or modify it + under the terms of version 2 of the GNU General Public License as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + + The full GNU General Public License is included in this distribution in the + file called LICENSE. + + Contact Information: + James P. Ketrenos + Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 + +******************************************************************************/ + +/* + * Theory of operation: + * + * The primary NIC mode of operation is configured within the RXON command. + * As such, there are two instances of RXON data -- staging_rxon and + * active_rxon. The former is used to configure the device, the later to + * reflect the actual currently active configuration. + * + * After configuring staging_rxon, it is activated by calling + * ipw_commit_rxon(). The ipw_commit_rxon() will ensure the correct sequence + * of commands are invoked on the hardware to result in Tx being possible + * (if the channel is appropriate for Tx) + * + * About the threading and lock model of the driver... + * + * There are three paths of execution through the driver. + * + * 1. ioctl based (wireless extensions, netdev, etc.) + * 2. interrupt based + * 3. scheduled work queue items + * + * As soon as an interrupt comes in, it schedules a tasklet. That tasklet, + * when run, does any HW checks, pulls any data from the read queue, + * and schedules other layers to do the actual work. + * + * NOTE: This driver is a work in progress. It is currently structured + * in a way that we can add support for the next wireless adapter + * available from Intel. + * + * Our current focus is as follows: + * 1. Get the driver working w/ mac80211 in STA(client) mode. + * 2. Clean up the dual-driver code from function redirection to + * if/else switches where the code detlas are minimal. + * 3. Evaluate the amount of delta between the hardware versions and + * possibly split iwlwifi into multiple drivers for each piece of + * HW, sharing as much base code as possible (would result in + * multiple driver files on disk vs. a single module that works + * with multiple hardware types) + * 4. Document the uCode regulatory enforcement + * 5. Document the rate scaling capabilities of the 3945 + * 6. Provide an initial rate scaling algorithm tailored for the + * statistic data exposed by the 3945. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//#define BIT(x) (1 << (x)) +#include +#include + +//#include +//#include +//#include +#include <../net/mac80211/ieee80211_rate.h> + +#include +#include + +#include "iwlwifi.h" + +#define IWLWIFI_VERSION "0.0.10k" + +#define DRV_DESCRIPTION "Intel(R) Wirless Link driver for Linux" +#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" +#define DRV_VERSION IWLWIFI_VERSION + +MODULE_DESCRIPTION(DRV_DESCRIPTION); +MODULE_VERSION(DRV_VERSION); +MODULE_AUTHOR(DRV_COPYRIGHT); +MODULE_LICENSE("GPL"); + +/*MAC80211 move this to mac80211 files */ +#define IEEE80211_FC(type, stype) cpu_to_le16((type << 2) | (stype << 4)) + +#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010 + +#define IEEE80211_24GHZ_BAND (1<<0) +#define IEEE80211_52GHZ_BAND (1<<1) + +#define IEEE80211_CCK_RATE_1MB 0x02 +#define IEEE80211_CCK_RATE_2MB 0x04 +#define IEEE80211_CCK_RATE_5MB 0x0B +#define IEEE80211_CCK_RATE_11MB 0x16 +#define IEEE80211_OFDM_RATE_6MB 0x0C +#define IEEE80211_OFDM_RATE_9MB 0x12 +#define IEEE80211_OFDM_RATE_12MB 0x18 +#define IEEE80211_OFDM_RATE_18MB 0x24 +#define IEEE80211_OFDM_RATE_24MB 0x30 +#define IEEE80211_OFDM_RATE_36MB 0x48 +#define IEEE80211_OFDM_RATE_48MB 0x60 +#define IEEE80211_OFDM_RATE_54MB 0x6C +#define IEEE80211_BASIC_RATE_MASK 0x80 + +#define IEEE80211_CCK_RATE_1MB_MASK (1<<0) +#define IEEE80211_CCK_RATE_2MB_MASK (1<<1) +#define IEEE80211_CCK_RATE_5MB_MASK (1<<2) +#define IEEE80211_CCK_RATE_11MB_MASK (1<<3) +#define IEEE80211_OFDM_RATE_6MB_MASK (1<<4) +#define IEEE80211_OFDM_RATE_9MB_MASK (1<<5) +#define IEEE80211_OFDM_RATE_12MB_MASK (1<<6) +#define IEEE80211_OFDM_RATE_18MB_MASK (1<<7) +#define IEEE80211_OFDM_RATE_24MB_MASK (1<<8) +#define IEEE80211_OFDM_RATE_36MB_MASK (1<<9) +#define IEEE80211_OFDM_RATE_48MB_MASK (1<<10) +#define IEEE80211_OFDM_RATE_54MB_MASK (1<<11) + +#define IEEE80211_CCK_RATES_MASK 0x0000000F +#define IEEE80211_CCK_BASIC_RATES_MASK (IEEE80211_CCK_RATE_1MB_MASK | \ + IEEE80211_CCK_RATE_2MB_MASK) +#define IEEE80211_CCK_DEFAULT_RATES_MASK (IEEE80211_CCK_BASIC_RATES_MASK | \ + IEEE80211_CCK_RATE_5MB_MASK | \ + IEEE80211_CCK_RATE_11MB_MASK) + +#define IEEE80211_OFDM_RATES_MASK 0x00000FF0 +#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \ + IEEE80211_OFDM_RATE_12MB_MASK | \ + IEEE80211_OFDM_RATE_24MB_MASK) +#define IEEE80211_OFDM_DEFAULT_RATES_MASK (IEEE80211_OFDM_BASIC_RATES_MASK | \ + IEEE80211_OFDM_RATE_9MB_MASK | \ + IEEE80211_OFDM_RATE_18MB_MASK | \ + IEEE80211_OFDM_RATE_36MB_MASK | \ + IEEE80211_OFDM_RATE_48MB_MASK | \ + IEEE80211_OFDM_RATE_54MB_MASK) +#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \ + IEEE80211_CCK_DEFAULT_RATES_MASK) + +#define IEEE80211_NUM_OFDM_RATES 8 +#define IEEE80211_NUM_CCK_RATES 4 +#define IEEE80211_OFDM_SHIFT_MASK_A 4 + +/*MAC80211 end */ + +static u32 ipw_debug_level; + +static int param_debug = 0; +static int param_channel = 0; +static int param_mode = 0; +static int param_auto_create = 1; /* def: create new adhoc network if needed */ +static int param_led = 1; /* def: use LEDs */ +static int param_disable = 0; /* def: enable radio */ +static int param_antenna = 0; /* def: 0 = both antennas (use diversity) */ +static int param_hwcrypto = 0; /* def: using software encryption */ +static int param_qos_enable = 1; + +static const char ipw_modes[] = { + 'a', 'b', 'g', '?' +}; + +#define LD_TIME_LINK_ON 300 + +static int ipw_power_init_handle(struct ipw_priv *priv); [...16032 lines suppressed...] + u8 flags; + /* We have 15 LSB to use as we please (MSB indicates + * a frame Rx'd from the HW). We encode the following + * information into the sequence field: + * + * 0:7 index in fifo + * 8:13 fifo selection + * 14:14 bit indicating if this packet references the 'extra' + * storage at the end of the memory queue + * 15:15 (Rx indication) + * + */ + u16 sequence; + + /* command data follows immediately */ + u8 data[0]; +} __attribute__ ((packed)); + +// Used for passing to driver number of successes and failures per rate +struct rate_histogram { + union { + u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; + u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; + u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; + } success; + union { + u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; + u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; + u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; + } failed; +} __attribute__ ((packed)); + +/* statistics command response */ + +struct statistics_rx_phy { + u32 ina_cnt; + u32 fina_cnt; + u32 plcp_err; + u32 crc32_err; + u32 overrun_err; + u32 early_overrun_err; + u32 crc32_good; + u32 false_alarm_cnt; + u32 fina_sync_err_cnt; + u32 sfd_timeout; + u32 fina_timeout; + u32 unresponded_rts; + u32 rxe_frame_limit_overrun; + u32 sent_ack_cnt; + u32 sent_cts_cnt; +} __attribute__ ((packed)); + +struct statistics_rx { + struct statistics_rx_phy ofdm; + struct statistics_rx_phy cck; + u32 bogus_cts; + u32 bogus_ack; + u32 non_bssid_frames; + u32 filtered_frames; + u32 non_channel_beacons; +} __attribute__ ((packed)); + +struct statistics_tx { + u32 preamble_cnt; + u32 rx_detected_cnt; + u32 bt_prio_defer_cnt; + u32 bt_prio_kill_cnt; + u32 few_bytes_cnt; + u32 cts_timeout; + u32 ack_timeout; + u32 expected_ack_cnt; + u32 actual_ack_cnt; +} __attribute__ ((packed)); + +struct statistics_dbg { + u32 burst_check; + u32 burst_count; + u32 reserved[4]; +} __attribute__ ((packed)); + +struct statistics_div { + u32 tx_on_a; + u32 tx_on_b; + u32 exec_time; + u32 probe_time; +} __attribute__ ((packed)); + +struct statistics_general { + u32 temperature; + struct statistics_dbg dbg; + u32 sleep_time; + u32 slots_out; + u32 slots_idle; + u32 ttl_timestamp; + struct statistics_div div; +} __attribute__ ((packed)); + +struct ipw_notif_statistics { + u32 flag; + struct statistics_rx rx; + struct statistics_tx tx; + struct statistics_general general; +} __attribute__ ((packed)); + +struct ipw_rx_packet { + u32 len; + struct ipw_cmd_header hdr; + union { + struct ipw_alive_resp alive_frame; + struct ipw_rx_frame rx_frame; + struct ipw_tx_resp tx_resp; + struct ipw_spectrum_notification spectrum_notif; + struct ipw_csa_notification csa_notif; + struct ipw_error_resp err_resp; + struct ipw_card_state_notif card_state_notif; + struct ipw_notif_statistics stats; + struct BeaconNtfSpecifics beacon_status; + struct ipw_add_sta_resp add_sta; + struct ipw_sleep_notification sleep_notif; + u32 status; + u8 raw[0]; + } u; +} __attribute__ ((packed)); + +#define IPW_RX_FRAME_SIZE (4 + sizeof(struct ipw_rx_frame)) + +struct ipw_multicast_addr { + u8 num_of_multicast_addresses; + u8 reserved[3]; + u8 mac1[6]; + u8 mac2[6]; + u8 mac3[6]; + u8 mac4[6]; +} __attribute__ ((packed)); + +struct ipw_tgi_tx_key { + u8 key_id; + u8 security_type; + u8 station_index; + u8 flags; + u8 key[16]; + u32 tx_counter[2]; +} __attribute__ ((packed)); + +struct ipw_associate { + u8 channel; + u8 auth_type:4, auth_key:4; + u8 assoc_type; + u8 reserved; + u16 policy_support; + u8 preamble_length; + u8 ieee_mode; + u8 bssid[ETH_ALEN]; + u32 assoc_tsf_msw; + u32 assoc_tsf_lsw; + u16 capability; + u16 listen_interval; + u16 beacon_interval; + u8 dest[ETH_ALEN]; + u16 atim_window; + u8 smr; + u8 reserved1; + u16 reserved2; + u16 assoc_id; + u8 erp_value; +} __attribute__ ((packed)); + +#define IPW_SUPPORTED_RATES_IE_LEN 8 + +struct ipw_supported_rates { + u8 ieee_mode; + u8 num_rates; + u8 purpose; + u8 reserved; + u8 supported_rates[IPW_MAX_RATES]; +} __attribute__ ((packed)); + +struct ipw_channel_tx_power { + u8 channel_number; + s8 tx_power; +} __attribute__ ((packed)); + + +#define IPW_RX_BUF_SIZE 3000 + +#endif /* __iwlwifi_hw_h__ */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-03-02 15:28:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/Makefile 2007-03-02 15:28:23.000000000 -0500 @@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211) += adm8211/ obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/ obj-$(CONFIG_RTL818X) += rtl818x/ +obj-$(CONFIG_IWLWIFI) += iwlwifi/ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-03-02 15:28:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/Kconfig 2007-03-02 15:28:23.000000000 -0500 @@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad source "drivers/net/wireless/mac80211/p54/Kconfig" source "drivers/net/wireless/mac80211/zd1211rw/Kconfig" source "drivers/net/wireless/mac80211/rtl818x/Kconfig" +source "drivers/net/wireless/mac80211/iwlwifi/Kconfig" jwltest-mac80211-backport-2_6_19-fixup.patch: drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 2 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 20 +-- drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 8 - drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 6 - drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 14 +- drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 2 net/mac80211/ieee80211.c | 8 - net/mac80211/ieee80211_i.h | 7 - net/mac80211/ieee80211_iface.c | 2 net/mac80211/ieee80211_sta.c | 28 ++--- net/mac80211/ieee80211_sysfs.c | 105 +++++++++---------- net/mac80211/ieee80211_sysfs_sta.c | 2 net/mac80211/sta_info.c | 7 - net/mac80211/wep.c | 1 net/mac80211/wme.c | 5 net/wireless/nl80211.c | 3 25 files changed, 255 insertions(+), 314 deletions(-) --- NEW FILE jwltest-mac80211-backport-2_6_19-fixup.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h 2007-03-02 15:00:06.000000000 -0500 @@ -742,7 +742,7 @@ struct bcm43xx_wldev { struct tasklet_struct isr_tasklet; /* Periodic tasks */ - struct delayed_work periodic_work; + struct work_struct periodic_work; unsigned int periodic_state; struct work_struct restart_work; --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c 2007-03-02 15:00:06.000000000 -0500 @@ -2284,10 +2284,9 @@ static int estimate_periodic_work_badnes return badness; } -static void bcm43xx_periodic_work_handler(struct work_struct *work) +static void bcm43xx_periodic_work_handler(void *d) { - struct bcm43xx_wldev *dev = - container_of(work, struct bcm43xx_wldev, periodic_work.work); + struct bcm43xx_wldev *dev = d; unsigned long flags; u32 savedirqs = 0; int badness; @@ -2336,12 +2335,12 @@ static void bcm43xx_periodic_tasks_delet static void bcm43xx_periodic_tasks_setup(struct bcm43xx_wldev *dev) { - struct delayed_work *work = &dev->periodic_work; + struct work_struct *work = &(dev->periodic_work); assert(bcm43xx_status(dev) == BCM43xx_STAT_INITIALIZED); dev->periodic_state = 0; - INIT_DELAYED_WORK(work, bcm43xx_periodic_work_handler); - schedule_delayed_work(work, 0); + INIT_WORK(work, bcm43xx_periodic_work_handler, dev); + schedule_work(work); } /* Validate access to the chip (SHM) */ @@ -3425,12 +3424,11 @@ static const struct ieee80211_ops bcm43x /* Hard-reset the chip. Do not call this directly. * Use bcm43xx_controller_restart() */ -static void bcm43xx_chip_reset(struct work_struct *work) +static void bcm43xx_chip_reset(void *d) { - struct bcm43xx_wldev *dev = - container_of(work, struct bcm43xx_wldev, restart_work); + struct bcm43xx_wldev *dev = d; struct bcm43xx_wl *wl = dev->wl; - int err; + int err = 0; int was_started = 0; int was_inited = 0; @@ -3630,7 +3628,7 @@ static int bcm43xx_wireless_core_attach( /* Now set some default "current_dev" */ if (!wl->current_dev) wl->current_dev = dev; - INIT_WORK(&dev->restart_work, bcm43xx_chip_reset); + INIT_WORK(&dev->restart_work, bcm43xx_chip_reset, dev); bcm43xx_radio_turn_off(dev); bcm43xx_switch_analog(dev, 0); --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h 2007-03-02 15:00:06.000000000 -0500 @@ -1226,9 +1226,9 @@ static void rt2500pci_disable_radio(stru /* * Interrupt functions. */ -static void rt2500pci_beacondone(struct work_struct *work); -static void rt2500pci_rxdone(struct work_struct *work); -static void rt2500pci_txdone(struct work_struct *work); +static void rt2500pci_beacondone(void *data); +static void rt2500pci_rxdone(void *data); +static void rt2500pci_txdone(void *data); static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance); #endif /* RT2500PCI_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c 2007-03-02 15:00:06.000000000 -0500 @@ -724,12 +724,9 @@ static void rt2500usb_config_mac_address /* * Link tuning */ -static void rt2500usb_link_tuner(struct work_struct *work) +static void rt2500usb_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u16 reg; u32 rssi; u8 reg_r17; @@ -905,7 +902,7 @@ static int rt2500usb_set_state(struct rt * Initialization functions. */ static int rt2500usb_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -915,7 +912,7 @@ static int rt2500usb_alloc_dma_ring(stru /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -1620,10 +1617,9 @@ static void rt2500usb_write_tx_desc(stru /* * Interrupt functions. */ -static void rt2500usb_beacondone(struct work_struct *work) +static void rt2500usb_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry(ring); struct sk_buff *skb; @@ -1638,10 +1634,9 @@ static void rt2500usb_beacondone(struct dev_kfree_skb_any(skb); } -static void rt2500usb_rxdone(struct work_struct *work) +static void rt2500usb_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -1724,10 +1719,9 @@ static void rt2500usb_rxdone(struct work rt2500usb_activity_led(rt2x00dev, 0); } -static void rt2500usb_txdone(struct work_struct *work) +static void rt2500usb_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct data_desc *txd; @@ -2145,13 +2139,11 @@ static void rt2500usb_set_multicast_list } } -static void rt2500usb_scan(struct work_struct *work) +static void rt2500usb_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2159,34 +2151,34 @@ static void rt2500usb_scan(struct work_s * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt2500usb_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt2500usb_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq, + rt2x00dev->scan->conf.scan_power_level); } else { rt2500usb_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt2500usb_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq, + rt2x00dev->scan->conf.scan_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2227,13 +2219,12 @@ static int rt2500usb_passive_scan(struct /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt2500usb_scan); + INIT_WORK(&rt2x00dev->scan->work, rt2500usb_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -2863,7 +2854,7 @@ static int rt2500usb_alloc_dev(struct us /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2500usb_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt2500usb_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h 2007-03-02 15:00:06.000000000 -0500 @@ -686,7 +686,7 @@ struct link { /* * Work structure for scheduling periodic link tuning. */ - struct delayed_work work; + struct work_struct work; }; static inline void rt2x00_start_link_tune(struct link *link) @@ -817,12 +817,6 @@ static inline void rt2x00_remove_interfa */ struct scanning { /* - * Pointer to main rt2x00dev structure where this - * scanning structure belongs to. - */ - struct rt2x00_dev *rt2x00dev; - - /* * Completion structure if an packet needs to be send. */ struct completion completion; --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h 2007-03-02 15:00:06.000000000 -0500 @@ -1390,9 +1390,9 @@ static void rt61pci_disable_radio(struct /* * Interrupt functions. */ -static void rt61pci_beacondone(struct work_struct *work); -static void rt61pci_rxdone(struct work_struct *work); -static void rt61pci_txdone(struct work_struct *work); +static void rt61pci_beacondone(void *data); +static void rt61pci_rxdone(void *data); +static void rt61pci_txdone(void *data); static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance); #endif /* RT61PCI_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c 2007-03-02 15:00:06.000000000 -0500 @@ -692,12 +692,9 @@ static void rt2500pci_config_mac_address /* * Link tuning */ -static void rt2500pci_link_tuner(struct work_struct *work) +static void rt2500pci_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u32 reg; u32 rssi; u8 reg_r17; @@ -851,7 +848,7 @@ static int rt2500pci_set_state(struct rt * Initialization functions. */ static int rt2500pci_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -860,7 +857,7 @@ static int rt2500pci_alloc_dma_ring(stru /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -1655,10 +1652,9 @@ static void rt2500pci_write_tx_desc(stru /* * Interrupt functions. */ -static void rt2500pci_beacondone(struct work_struct *work) +static void rt2500pci_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry(ring); struct sk_buff *skb; @@ -1673,10 +1669,9 @@ static void rt2500pci_beacondone(struct dev_kfree_skb_any(skb); } -static void rt2500pci_rxdone(struct work_struct *work) +static void rt2500pci_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -1741,10 +1736,9 @@ static void rt2500pci_rxdone(struct work rt2500pci_activity_led(rt2x00dev, 0); } -static void rt2500pci_txdone(struct work_struct *work) +static void rt2500pci_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct data_desc *txd; @@ -2207,13 +2201,11 @@ static void rt2500pci_set_multicast_list rt2x00dev->interface.promisc); } -static void rt2500pci_scan(struct work_struct *work) +static void rt2500pci_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2221,34 +2213,34 @@ static void rt2500pci_scan(struct work_s * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt2500pci_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt2500pci_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq, + rt2x00dev->scan->conf.scan_power_level); } else { rt2500pci_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt2500pci_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq, + rt2x00dev->scan->conf.scan_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2289,13 +2281,12 @@ static int rt2500pci_passive_scan(struct /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt2500pci_scan); + INIT_WORK(&rt2x00dev->scan->work, rt2500pci_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -3039,7 +3030,7 @@ static int rt2500pci_alloc_dev(struct pc /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2500pci_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt2500pci_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h 2007-03-02 15:00:06.000000000 -0500 @@ -731,9 +731,9 @@ static void rt2500usb_disable_radio(stru /* * Interrupt functions. */ -static void rt2500usb_beacondone(struct work_struct *work); -static void rt2500usb_rxdone(struct work_struct *work); -static void rt2500usb_txdone(struct work_struct *work); +static void rt2500usb_beacondone(void *data); +static void rt2500usb_rxdone(void *data); +static void rt2500usb_txdone(void *data); static void rt2500usb_interrupt(struct urb *urb); #endif /* RT2500USB_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c 2007-03-02 15:00:06.000000000 -0500 @@ -916,12 +916,9 @@ static void rt61pci_config_mac_address(s /* * Link tuning */ -static void rt61pci_link_tuner(struct work_struct *work) +static void rt61pci_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u32 reg; u32 rssi; u8 reg_r17; @@ -1267,7 +1264,7 @@ static int rt61pci_init_firmware(struct } static int rt61pci_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *work), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -1276,7 +1273,7 @@ static int rt61pci_alloc_dma_ring(struct /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -2115,10 +2112,9 @@ static void rt61pci_write_tx_desc(struct /* * Interrupt functions. */ -static void rt61pci_beacondone(struct work_struct *work) +static void rt61pci_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry(ring); struct sk_buff *skb; @@ -2133,10 +2129,9 @@ static void rt61pci_beacondone(struct wo dev_kfree_skb_any(skb); } -static void rt61pci_rxdone(struct work_struct *work) +static void rt61pci_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -2261,10 +2256,9 @@ static void rt61pci_txdone_entry(struct entry->tx_status.control.queue); } -static void rt61pci_txdone(struct work_struct *work) +static void rt61pci_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; int index; int reg; @@ -2691,13 +2685,11 @@ static void rt61pci_set_multicast_list(s rt2x00dev->interface.promisc); } -static void rt61pci_scan(struct work_struct *work) +static void rt61pci_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2705,34 +2697,34 @@ static void rt61pci_scan(struct work_str * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt61pci_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt61pci_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq, + rt2x00dev->scan->conf.scan_power_level); } else { rt61pci_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt61pci_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq, + rt2x00dev->scan->conf.scan_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2773,13 +2765,12 @@ static int rt61pci_passive_scan(struct i /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt61pci_scan); + INIT_WORK(&rt2x00dev->scan->work, rt61pci_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -3558,7 +3549,7 @@ static int rt61pci_alloc_dev(struct pci_ /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt61pci_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt61pci_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h 2007-03-02 15:00:06.000000000 -0500 @@ -972,9 +972,9 @@ static void rt73usb_disable_radio(struct /* * Interrupt functions. */ -static void rt73usb_beacondone(struct work_struct *work); -static void rt73usb_rxdone(struct work_struct *work); -static void rt73usb_txdone(struct work_struct *work); +static void rt73usb_beacondone(void *data); +static void rt73usb_rxdone(void *data); +static void rt73usb_txdone(void *data); static void rt73usb_interrupt(struct urb *urb); #endif /* RT73USB_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h 2007-03-02 15:00:06.000000000 -0500 @@ -959,9 +959,9 @@ static void rt2400pci_disable_radio(stru /* * Interrupt functions. */ -static void rt2400pci_beacondone(struct work_struct *work); -static void rt2400pci_rxdone(struct work_struct *work); -static void rt2400pci_txdone(struct work_struct *work); +static void rt2400pci_beacondone(void *data); +static void rt2400pci_rxdone(void *data); +static void rt2400pci_txdone(void *data); static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance); #endif /* RT2400PCI_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-03-02 15:00:06.000000000 -0500 @@ -814,12 +814,9 @@ static void rt73usb_config_mac_address(s /* * Link tuning */ -static void rt73usb_link_tuner(struct work_struct *work) +static void rt73usb_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u32 reg; u32 rssi; u8 reg_r17; @@ -1125,7 +1122,7 @@ static int rt73usb_init_firmware(struct } static int rt73usb_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *work), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -1135,7 +1132,7 @@ static int rt73usb_alloc_dma_ring(struct /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -1889,10 +1886,9 @@ static void rt73usb_write_tx_desc(struct /* * Interrupt functions. */ -static void rt73usb_beacondone(struct work_struct *work) +static void rt73usb_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry( &rt2x00dev->ring[RING_BEACON]); @@ -1908,10 +1904,9 @@ static void rt73usb_beacondone(struct wo dev_kfree_skb_any(skb); } -static void rt73usb_rxdone(struct work_struct *work) +static void rt73usb_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -1985,10 +1980,9 @@ static void rt73usb_rxdone(struct work_s } } -static void rt73usb_txdone(struct work_struct *work) +static void rt73usb_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct data_desc *txd; @@ -2405,13 +2399,11 @@ static void rt73usb_set_multicast_list(s } } -static void rt73usb_scan(struct work_struct *work) +static void rt73usb_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2419,34 +2411,34 @@ static void rt73usb_scan(struct work_str * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt73usb_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt73usb_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq, + rt2x00dev->scan->conf.scan_power_level); } else { rt73usb_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt73usb_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq, + rt2x00dev->scan->conf.scan_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2487,13 +2479,12 @@ static int rt73usb_passive_scan(struct i /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt73usb_scan); + INIT_WORK(&rt2x00dev->scan->work, rt73usb_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -3195,7 +3186,7 @@ static int rt73usb_alloc_dev(struct usb_ /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt73usb_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt73usb_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c 2007-03-02 15:00:06.000000000 -0500 @@ -617,12 +617,9 @@ static void rt2400pci_config_mac_address /* * Link tuning */ -static void rt2400pci_link_tuner(struct work_struct *work) +static void rt2400pci_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u8 reg; char false_cca_delta; @@ -757,7 +754,7 @@ static int rt2400pci_set_state(struct rt * Initialization functions. */ static int rt2400pci_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -766,7 +763,7 @@ static int rt2400pci_alloc_dma_ring(stru /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -1496,10 +1493,9 @@ static void rt2400pci_write_tx_desc(stru /* * Interrupt functions. */ -static void rt2400pci_beacondone(struct work_struct *work) +static void rt2400pci_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry(ring); struct sk_buff *skb; @@ -1514,10 +1510,9 @@ static void rt2400pci_beacondone(struct dev_kfree_skb_any(skb); } -static void rt2400pci_rxdone(struct work_struct *work) +static void rt2400pci_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -1575,10 +1570,9 @@ static void rt2400pci_rxdone(struct work rt2400pci_activity_led(rt2x00dev, 0); } -static void rt2400pci_txdone(struct work_struct *work) +static void rt2400pci_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct data_desc *txd; @@ -2040,13 +2034,11 @@ static void rt2400pci_set_multicast_list rt2x00dev->interface.promisc); } -static void rt2400pci_scan(struct work_struct *work) +static void rt2400pci_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2054,38 +2046,38 @@ static void rt2400pci_scan(struct work_s * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt2400pci_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt2400pci_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq); rt2400pci_config_txpower(rt2x00dev, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_power_level); } else { rt2400pci_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt2400pci_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq); rt2400pci_config_txpower(rt2x00dev, - scan->conf.running_power_level); + rt2x00dev->scan->conf.running_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2126,13 +2118,12 @@ static int rt2400pci_passive_scan(struct /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt2400pci_scan); + INIT_WORK(&rt2x00dev->scan->work, rt2400pci_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -2727,7 +2718,7 @@ static int rt2400pci_alloc_dev(struct pc /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2400pci_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt2400pci_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c 2007-03-02 15:00:06.000000000 -0500 @@ -552,10 +552,9 @@ static int zd_mac_config_interface(struc return 0; } -static void set_multicast_hash_handler(struct work_struct *work) +static void set_multicast_hash_handler(void *_mac) { - struct zd_mac *mac = - container_of(work, struct zd_mac, set_multicast_hash_work); + struct zd_mac *mac = _mac; struct zd_mc_hash hash; spin_lock_irq(&mac->lock); @@ -655,7 +654,7 @@ struct ieee80211_hw *zd_mac_alloc(struct skb_queue_head_init(&mac->tx_queue); zd_chip_init(&mac->chip, dev, intf); housekeeping_init(mac); - INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler); + INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler, mac); SET_IEEE80211_DEV(dev, &intf->dev); return dev; @@ -663,10 +662,9 @@ struct ieee80211_hw *zd_mac_alloc(struct #define LINK_LED_WORK_DELAY HZ -static void link_led_handler(struct work_struct *work) +static void link_led_handler(void *p) { - struct zd_mac *mac = - container_of(work, struct zd_mac, housekeeping.link_led_work.work); + struct zd_mac *mac = p; struct zd_chip *chip = &mac->chip; int is_associated; int r; @@ -686,7 +684,7 @@ static void link_led_handler(struct work static void housekeeping_init(struct zd_mac *mac) { - INIT_DELAYED_WORK(&mac->housekeeping.link_led_work, link_led_handler); + INIT_WORK(&mac->housekeeping.link_led_work, link_led_handler, mac); } static void housekeeping_enable(struct zd_mac *mac) --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h 2007-03-02 15:00:06.000000000 -0500 @@ -119,7 +119,7 @@ enum mac_flags { }; struct housekeeping { - struct delayed_work link_led_work; + struct work_struct link_led_work; }; #define ZD_MAC_STATS_BUFFER_SIZE 16 --- linux-2.6.19.noarch/net/wireless/nl80211.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/wireless/nl80211.c 2007-03-02 15:00:06.000000000 -0500 @@ -1002,7 +1002,8 @@ static struct genl_ops nl80211_ops[] = { void *nl80211hdr_put(struct sk_buff *skb, u32 pid, u32 seq, int flags, u8 cmd) { /* since there is no private header just add the generic one */ - return genlmsg_put(skb, pid, seq, &nl80211_fam, flags, cmd); + return genlmsg_put(skb, pid, seq, nl80211_fam.id, nl80211_fam.hdrsize, + flags, cmd, nl80211_fam.version); } EXPORT_SYMBOL_GPL(nl80211hdr_put); --- linux-2.6.19.noarch/net/mac80211/wme.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/wme.c 2007-03-02 15:00:06.000000000 -0500 @@ -417,8 +417,7 @@ static int wme_qdiscop_init(struct Qdisc /* create child queues */ for (i = 0; i < queues; i++) { skb_queue_head_init(&q->requeued[i]); - q->queues[i] = qdisc_create_dflt(qd->dev, &CHILD_QDISC_OPS, - qd->handle); + q->queues[i] = qdisc_create_dflt(qd->dev, &CHILD_QDISC_OPS); if (q->queues[i] == 0) { q->queues[i] = &noop_qdisc; printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i); @@ -644,7 +643,7 @@ void ieee80211_install_qdisc(struct net_ { struct Qdisc *qdisc; - qdisc = qdisc_create_dflt(dev, &wme_qdisc_ops, TC_H_ROOT); + qdisc = qdisc_create_dflt(dev, &wme_qdisc_ops); if (!qdisc) { printk(KERN_ERR "%s: qdisc installation failed\n", dev->name); return; --- linux-2.6.19.noarch/net/mac80211/ieee80211_i.h.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_i.h 2007-03-02 15:00:06.000000000 -0500 @@ -443,8 +443,7 @@ struct ieee80211_local { int scan_channel_idx; enum { SCAN_SET_CHANNEL, SCAN_SEND_PROBE } scan_state; unsigned long last_scan_completed; - struct delayed_work scan_work; - struct net_device *scan_dev; + struct work_struct scan_work; struct ieee80211_channel *oper_channel, *scan_channel; struct ieee80211_hw_mode *oper_hw_mode, *scan_hw_mode; u8 scan_ssid[IEEE80211_MAX_SSID_LEN]; @@ -667,8 +666,8 @@ int ieee80211_init_client(struct net_dev int ieee80211_set_channel(struct ieee80211_local *local, int channel, int freq); /* ieee80211_sta.c */ void ieee80211_sta_timer(unsigned long data); -void ieee80211_sta_work(struct work_struct *work); -void ieee80211_sta_scan_work(struct work_struct *work); +void ieee80211_sta_scan_work(void *l); +void ieee80211_sta_work(void *ptr); void ieee80211_sta_rx_mgmt(struct net_device *dev, struct sk_buff *skb, struct ieee80211_rx_status *rx_status); int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len); --- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c 2007-03-02 15:05:19.000000000 -0500 @@ -24,6 +24,9 @@ static inline struct ieee80211_local *to return wiphy_priv(wiphy); } +#define to_net_dev(class) \ + container_of(class, struct net_device, class_dev) + static inline int rtnl_lock_local(struct ieee80211_local *local) { rtnl_lock(); @@ -364,12 +367,11 @@ static struct attribute_group ieee80211_ /* attributes in /sys/class/net/X/ */ -static ssize_t ieee80211_if_show(struct device *d, - struct device_attribute *attr, char *buf, +static ssize_t ieee80211_if_show(struct class_device *cd, char *buf, ssize_t (*format)(const struct ieee80211_sub_if_data *, char *)) { - struct net_device *dev = to_net_dev(d); + struct net_device *dev = to_net_dev(cd); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); ssize_t ret = -EINVAL; @@ -409,13 +411,12 @@ static ssize_t ieee80211_if_fmt_##name(c } #define __IEEE80211_IF_SHOW(name) \ -static ssize_t ieee80211_if_show_##name(struct device *d, \ - struct device_attribute *attr, \ +static ssize_t ieee80211_if_show_##name(struct class_device *cd, \ char *buf) \ { \ - return ieee80211_if_show(d, attr, buf, ieee80211_if_fmt_##name);\ + return ieee80211_if_show(cd, buf, ieee80211_if_fmt_##name); \ } \ -static DEVICE_ATTR(name, S_IRUGO, ieee80211_if_show_##name, NULL); +static CLASS_DEVICE_ATTR(name, S_IRUGO, ieee80211_if_show_##name, NULL); #define IEEE80211_IF_SHOW(name, field, format) \ IEEE80211_IF_FMT_##format(name, field) \ @@ -509,64 +510,64 @@ static ssize_t ieee80211_if_fmt_mode(con __IEEE80211_IF_SHOW(mode); static struct attribute *ieee80211_sta_attrs[] = { - &dev_attr_channel_use.attr, - &dev_attr_drop_unencrypted.attr, - &dev_attr_eapol.attr, - &dev_attr_ieee8021_x.attr, - &dev_attr_state.attr, - &dev_attr_bssid.attr, - &dev_attr_prev_bssid.attr, - &dev_attr_ssid_len.attr, - &dev_attr_aid.attr, - &dev_attr_ap_capab.attr, - &dev_attr_capab.attr, - &dev_attr_extra_ie_len.attr, - &dev_attr_auth_tries.attr, - &dev_attr_assoc_tries.attr, - &dev_attr_auth_algs.attr, - &dev_attr_auth_alg.attr, - &dev_attr_auth_transaction.attr, - &dev_attr_flags.attr, + &class_device_attr_channel_use.attr, + &class_device_attr_drop_unencrypted.attr, + &class_device_attr_eapol.attr, + &class_device_attr_ieee8021_x.attr, + &class_device_attr_state.attr, + &class_device_attr_bssid.attr, + &class_device_attr_prev_bssid.attr, + &class_device_attr_ssid_len.attr, + &class_device_attr_aid.attr, + &class_device_attr_ap_capab.attr, + &class_device_attr_capab.attr, + &class_device_attr_extra_ie_len.attr, + &class_device_attr_auth_tries.attr, + &class_device_attr_assoc_tries.attr, + &class_device_attr_auth_algs.attr, + &class_device_attr_auth_alg.attr, + &class_device_attr_auth_transaction.attr, + &class_device_attr_flags.attr, NULL }; static struct attribute *ieee80211_ap_attrs[] = { - &dev_attr_channel_use.attr, - &dev_attr_drop_unencrypted.attr, - &dev_attr_eapol.attr, - &dev_attr_ieee8021_x.attr, - &dev_attr_num_sta_ps.attr, - &dev_attr_dtim_period.attr, - &dev_attr_dtim_count.attr, - &dev_attr_num_beacons.attr, - &dev_attr_force_unicast_rateidx.attr, - &dev_attr_max_ratectrl_rateidx.attr, - &dev_attr_num_buffered_multicast.attr, - &dev_attr_beacon_head_len.attr, - &dev_attr_beacon_tail_len.attr, + &class_device_attr_channel_use.attr, + &class_device_attr_drop_unencrypted.attr, + &class_device_attr_eapol.attr, + &class_device_attr_ieee8021_x.attr, + &class_device_attr_num_sta_ps.attr, + &class_device_attr_dtim_period.attr, + &class_device_attr_dtim_count.attr, + &class_device_attr_num_beacons.attr, + &class_device_attr_force_unicast_rateidx.attr, + &class_device_attr_max_ratectrl_rateidx.attr, + &class_device_attr_num_buffered_multicast.attr, + &class_device_attr_beacon_head_len.attr, + &class_device_attr_beacon_tail_len.attr, NULL }; static struct attribute *ieee80211_wds_attrs[] = { - &dev_attr_channel_use.attr, - &dev_attr_drop_unencrypted.attr, - &dev_attr_eapol.attr, - &dev_attr_ieee8021_x.attr, - &dev_attr_peer.attr, + &class_device_attr_channel_use.attr, + &class_device_attr_drop_unencrypted.attr, + &class_device_attr_eapol.attr, + &class_device_attr_ieee8021_x.attr, + &class_device_attr_peer.attr, NULL }; static struct attribute *ieee80211_vlan_attrs[] = { - &dev_attr_channel_use.attr, - &dev_attr_drop_unencrypted.attr, - &dev_attr_eapol.attr, - &dev_attr_ieee8021_x.attr, - &dev_attr_vlan_id.attr, + &class_device_attr_channel_use.attr, + &class_device_attr_drop_unencrypted.attr, + &class_device_attr_eapol.attr, + &class_device_attr_ieee8021_x.attr, + &class_device_attr_vlan_id.attr, NULL }; static struct attribute *ieee80211_monitor_attrs[] = { - &dev_attr_mode.attr, + &class_device_attr_mode.attr, NULL }; @@ -694,14 +695,14 @@ out: int ieee80211_sysfs_change_if_type(struct net_device *dev) { - return ieee80211_add_if_group(&dev->dev.kobj, dev); + return ieee80211_add_if_group(&dev->class_dev.kobj, dev); } int ieee80211_sysfs_add_netdevice(struct net_device *dev) { int res; - res = ieee80211_add_if_group(&dev->dev.kobj, dev); + res = ieee80211_add_if_group(&dev->class_dev.kobj, dev); if (res) goto err_fail_if_group; res = ieee80211_key_kset_sysfs_register(IEEE80211_DEV_TO_SUB_IF(dev)); @@ -714,5 +715,5 @@ err_fail_if_group: void ieee80211_sysfs_remove_netdevice(struct net_device *dev) { ieee80211_key_kset_sysfs_unregister(IEEE80211_DEV_TO_SUB_IF(dev)); - ieee80211_remove_if_group(&dev->dev.kobj, dev); + ieee80211_remove_if_group(&dev->class_dev.kobj, dev); } --- linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c 2007-03-02 15:00:06.000000000 -0500 @@ -181,7 +181,7 @@ void ieee80211_if_set_type(struct net_de struct ieee80211_if_sta *ifsta; ifsta = &sdata->u.sta; - INIT_WORK(&ifsta->work, ieee80211_sta_work); + INIT_WORK(&ifsta->work, ieee80211_sta_work, dev); setup_timer(&ifsta->timer, ieee80211_sta_timer, (unsigned long) ifsta); skb_queue_head_init(&ifsta->skb_queue); --- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c 2007-03-02 15:00:06.000000000 -0500 @@ -387,7 +387,7 @@ int ieee80211_key_kset_sysfs_register(st res = kobject_set_name(&sdata->key_kset.kobj, "keys"); if (res) return res; - sdata->key_kset.kobj.parent = &sdata->dev->dev.kobj; + sdata->key_kset.kobj.parent = &sdata->dev->class_dev.kobj; sdata->key_kset.ktype = &key_ktype; return kset_register(&sdata->key_kset); } --- linux-2.6.19.noarch/net/mac80211/sta_info.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/sta_info.c 2007-03-02 15:00:06.000000000 -0500 @@ -342,10 +342,9 @@ static void sta_info_cleanup(unsigned lo } -static void sta_info_proc_add_task(struct work_struct *work) +static void sta_info_proc_add_task(void *data) { - struct ieee80211_local *local = - container_of(work, struct ieee80211_local, sta_proc_add); + struct ieee80211_local *local = data; struct sta_info *sta, *tmp; while (1) { @@ -396,7 +395,7 @@ void sta_info_init(struct ieee80211_loca local->sta_cleanup.data = (unsigned long) local; local->sta_cleanup.function = sta_info_cleanup; - INIT_WORK(&local->sta_proc_add, sta_info_proc_add_task); + INIT_WORK(&local->sta_proc_add, sta_info_proc_add_task, local); } int sta_info_start(struct ieee80211_local *local) --- linux-2.6.19.noarch/net/mac80211/wep.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/wep.c 2007-03-02 15:00:06.000000000 -0500 @@ -15,7 +15,6 @@ #include #include #include -#include #include #include --- linux-2.6.19.noarch/net/mac80211/ieee80211.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211.c 2007-03-02 15:00:06.000000000 -0500 @@ -2199,13 +2199,13 @@ void ieee80211_if_shutdown(struct net_de flush_scheduled_work(); skb_queue_purge(&sdata->u.sta.skb_queue); if (!local->ops->hw_scan && - local->scan_dev == sdata->dev) { + local->scan_work.data == sdata->dev) { local->sta_scanning = 0; cancel_delayed_work(&local->scan_work); flush_scheduled_work(); /* see comment in ieee80211_unregister_hw to * understand why this works */ - local->scan_dev = NULL; + local->scan_work.data = NULL; } else flush_scheduled_work(); break; @@ -4584,7 +4584,7 @@ struct ieee80211_hw *ieee80211_alloc_hw( spin_lock_init(&local->sub_if_lock); INIT_LIST_HEAD(&local->sub_if_list); - INIT_DELAYED_WORK(&local->scan_work, ieee80211_sta_scan_work); + INIT_WORK(&local->scan_work, ieee80211_sta_scan_work, local); init_timer(&local->stat_timer); local->stat_timer.function = ieee80211_stat_refresh; local->stat_timer.data = (unsigned long) local; @@ -4776,7 +4776,7 @@ void ieee80211_unregister_hw(struct ieee if (local->stat_time) del_timer_sync(&local->stat_timer); - if (!local->ops->hw_scan && local->scan_dev) { + if (!local->ops->hw_scan && local->scan_work.data) { local->sta_scanning = 0; cancel_delayed_work(&local->scan_work); flush_scheduled_work(); --- linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c.orig 2007-03-02 14:58:57.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c 2007-03-02 15:00:06.000000000 -0500 @@ -1898,11 +1898,10 @@ void ieee80211_sta_timer(unsigned long d } -void ieee80211_sta_work(struct work_struct *work) +void ieee80211_sta_work(void *ptr) { - struct ieee80211_sub_if_data *sdata = - container_of(work, struct ieee80211_sub_if_data, u.sta.work); - struct net_device *dev = sdata->dev; + struct net_device *dev = ptr; + struct ieee80211_sub_if_data *sdata; struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); struct ieee80211_if_sta *ifsta; struct sk_buff *skb; @@ -1910,10 +1909,10 @@ void ieee80211_sta_work(struct work_stru if (!netif_running(dev)) return; - /* TODO: scan_dev check should be removed once scan_completed wakes + /* TODO: scan_work.data check should be removed once scan_completed wakes * every STA interface */ if (local->sta_scanning && - local->scan_dev == dev) + local->scan_work.data == dev) return; sdata = IEEE80211_DEV_TO_SUB_IF(dev); @@ -2513,7 +2512,7 @@ int ieee80211_sta_set_bssid(struct net_d void ieee80211_scan_completed(struct ieee80211_hw *hw) { struct ieee80211_local *local = hw_to_local(hw); - struct net_device *dev = local->scan_dev; + struct net_device *dev = local->scan_work.data; struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); union iwreq_data wrqu; @@ -2541,11 +2540,10 @@ void ieee80211_scan_completed(struct iee } EXPORT_SYMBOL(ieee80211_scan_completed); -void ieee80211_sta_scan_work(struct work_struct *work) +void ieee80211_sta_scan_work(void *l) { - struct ieee80211_local *local = - container_of(work, struct ieee80211_local, scan_work.work); - struct net_device *dev = local->scan_dev; + struct ieee80211_local *local = l; + struct net_device *dev = local->scan_work.data; struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_hw_mode *mode; struct ieee80211_channel *chan; @@ -2649,7 +2647,7 @@ static int ieee80211_sta_start_scan(stru * scan */ if (local->sta_scanning) { - if (local->scan_dev == dev) + if (local->scan_work.data == dev) return 0; return -EBUSY; } @@ -2661,7 +2659,7 @@ static int ieee80211_sta_start_scan(stru ssid, ssid_len); if (!rc) { local->sta_scanning = 1; - local->scan_dev = dev; + local->scan_work.data = dev; } return rc; } @@ -2679,7 +2677,7 @@ static int ieee80211_sta_start_scan(stru struct ieee80211_hw_mode, list); local->scan_channel_idx = 0; - local->scan_dev = dev; + local->scan_work.data = dev; schedule_delayed_work(&local->scan_work, 0); return 0; @@ -2696,7 +2694,7 @@ int ieee80211_sta_req_scan(struct net_de return ieee80211_sta_start_scan(dev, ssid, ssid_len); if (local->sta_scanning) { - if (local->scan_dev == dev) + if (local->scan_work.data == dev) return 0; return -EBUSY; } jwltest-mac80211-backport.patch: CREDITS | 33 MAINTAINERS | 43 drivers/Kconfig | 2 drivers/Makefile | 1 drivers/net/wireless/Kconfig | 2 drivers/net/wireless/Makefile | 3 drivers/net/wireless/mac80211/Kconfig | 6 drivers/net/wireless/mac80211/Makefile | 6 drivers/net/wireless/mac80211/README | 2 drivers/net/wireless/mac80211/adm8211/Kconfig | 24 drivers/net/wireless/mac80211/adm8211/Makefile | 1 drivers/net/wireless/mac80211/adm8211/adm8211.c | 2188 +++++++ drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 ++ drivers/net/wireless/mac80211/bcm43xx/Kconfig | 99 drivers/net/wireless/mac80211/bcm43xx/Makefile | 17 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 870 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1297 ++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1051 +++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 89 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 3962 ++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pci.c | 61 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pci.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4234 +++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 307 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.c | 202 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.h | 83 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 615 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 215 drivers/net/wireless/mac80211/p54/Kconfig | 9 drivers/net/wireless/mac80211/p54/Makefile | 4 drivers/net/wireless/mac80211/p54/net2280.h | 452 + drivers/net/wireless/mac80211/p54/prism54.h | 77 drivers/net/wireless/mac80211/p54/prism54common.c | 807 ++ drivers/net/wireless/mac80211/p54/prism54common.h | 304 drivers/net/wireless/mac80211/p54/prism54magic.h | 77 drivers/net/wireless/mac80211/p54/prism54pci.c | 698 ++ drivers/net/wireless/mac80211/p54/prism54pci.h | 106 drivers/net/wireless/mac80211/p54/prism54usb.c | 946 +++ drivers/net/wireless/mac80211/p54/prism54usb.h | 133 drivers/net/wireless/mac80211/rt2x00/Kconfig | 83 drivers/net/wireless/mac80211/rt2x00/Makefile | 5 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 2985 +++++++++ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 967 +++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 3297 ++++++++++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1234 +++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 3131 ++++++++++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 739 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1268 ++++ drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 44 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 81 drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 3827 ++++++++++++ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1398 ++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 3467 +++++++++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 980 +++ drivers/net/wireless/mac80211/rtl818x/Kconfig | 8 drivers/net/wireless/mac80211/rtl818x/Makefile | 2 drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 712 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 738 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 28 drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 175 drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19 drivers/net/wireless/mac80211/zd1211rw/Makefile | 11 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1674 +++++ drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 909 ++ drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 705 ++ drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 156 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 81 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 373 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 274 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1324 ++++ drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241 drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82 drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29 drivers/ssb/Kconfig | 93 drivers/ssb/Makefile | 14 drivers/ssb/core.c | 956 +++ drivers/ssb/driver_chipcommon/chipcommon.c | 402 + drivers/ssb/driver_mips/mips.c | 258 drivers/ssb/driver_pci/pcicore.c | 556 + drivers/ssb/pci.c | 667 ++ drivers/ssb/pcihost_wrapper.c | 104 drivers/ssb/pcmcia.c | 256 drivers/ssb/scan.c | 427 + drivers/ssb/ssb_private.h | 152 drivers/usb/host/Kconfig | 10 drivers/usb/host/ohci-hcd.c | 4 drivers/usb/host/ohci-ssb.c | 193 include/linux/Kbuild | 2 include/linux/crc-itu-t.h | 27 include/linux/eeprom_93cx6.h | 77 include/linux/ieee80211.h | 330 + include/linux/netdevice.h | 5 include/linux/nl80211.h | 275 include/linux/ssb/ssb.h | 388 + include/linux/ssb/ssb_driver_chipcommon.h | 387 + include/linux/ssb/ssb_driver_extif.h | 163 include/linux/ssb/ssb_driver_mips.h | 47 include/linux/ssb/ssb_driver_pci.h | 108 include/linux/ssb/ssb_regs.h | 294 include/net/cfg80211.h | 169 include/net/iw_handler.h | 3 include/net/mac80211.h | 1079 +++ include/net/wireless.h | 153 lib/Kconfig | 16 lib/Makefile | 3 lib/crc-itu-t.c | 64 lib/eeprom_93cx6.c | 344 + net/Kconfig | 3 net/Makefile | 2 net/core/Makefile | 1 net/core/dev.c | 33 net/core/wireless.c | 2353 ------- net/mac80211/Kconfig | 73 net/mac80211/Makefile | 26 net/mac80211/aes_ccm.c | 155 net/mac80211/aes_ccm.h | 26 net/mac80211/fifo_qdisc.c | 102 net/mac80211/hostapd_ioctl.h | 434 + net/mac80211/ieee80211.c | 4940 ++++++++++++++++ net/mac80211/ieee80211_cfg.c | 90 net/mac80211/ieee80211_cfg.h | 9 net/mac80211/ieee80211_common.h | 98 net/mac80211/ieee80211_i.h | 720 ++ net/mac80211/ieee80211_iface.c | 372 + net/mac80211/ieee80211_ioctl.c | 3304 ++++++++++ net/mac80211/ieee80211_key.h | 89 net/mac80211/ieee80211_led.c | 91 net/mac80211/ieee80211_led.h | 32 net/mac80211/ieee80211_rate.c | 140 net/mac80211/ieee80211_rate.h | 161 net/mac80211/ieee80211_scan.c | 344 + net/mac80211/ieee80211_sta.c | 3013 +++++++++ net/mac80211/ieee80211_sysfs.c | 718 ++ net/mac80211/ieee80211_sysfs.h | 12 net/mac80211/ieee80211_sysfs_sta.c | 438 + net/mac80211/michael.c | 104 net/mac80211/michael.h | 20 net/mac80211/rc80211_simple.c | 399 + net/mac80211/sta_info.c | 461 + net/mac80211/sta_info.h | 150 net/mac80211/tkip.c | 341 + net/mac80211/tkip.h | 36 net/mac80211/wep.c | 328 + net/mac80211/wep.h | 40 net/mac80211/wme.c | 679 ++ net/mac80211/wme.h | 38 net/mac80211/wpa.c | 846 ++ net/mac80211/wpa.h | 34 net/wireless/Kconfig | 31 net/wireless/Makefile | 17 net/wireless/core.c | 321 + net/wireless/core.h | 77 net/wireless/nl80211.c | 1051 +++ net/wireless/nl80211.h | 17 net/wireless/sysfs.c | 125 net/wireless/sysfs.h | 9 net/wireless/wext-common.c | 663 ++ net/wireless/wext-compat.c | 819 ++ net/wireless/wext-export.c | 29 net/wireless/wext-mod.c | 20 net/wireless/wext-old.c | 1461 ++++ net/wireless/wext.h | 51 183 files changed, 86288 insertions(+), 2390 deletions(-) --- NEW FILE jwltest-mac80211-backport.patch --- --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.19.noarch/include/net/wireless.h 2007-03-02 14:57:04.000000000 -0500 @@ -0,0 +1,153 @@ +#ifndef __NET_WIRELESS_H +#define __NET_WIRELESS_H + +/* + * 802.11 device management + * + * Copyright 2007 Johannes Berg + */ + +#include +#include +#include +#include + +/** + * struct wiphy - wireless hardware description + * @idx: the wiphy index assigned to this item + * @class_dev: the class device representing /sys/class/ieee80211/ + */ +struct wiphy { + /* assign these fields before you register the wiphy */ + + /* permanent MAC address */ + u8 perm_addr[ETH_ALEN]; + + /* fields below are read-only, assigned by cfg80211 */ + + /* the item in /sys/class/ieee80211/ points to this, + * you need use set_wiphy_dev() (see below) */ + struct device dev; + + /* dir in debugfs: ieee80211/ */ + struct dentry *debugfsdir; + + char priv[0] __attribute__((__aligned__(NETDEV_ALIGN))); +}; + +/** struct wireless_dev - wireless per-netdev state + * + * This structure must be allocated by the driver/stack + * that uses the ieee80211_ptr field in struct net_device + * (this is intentional so it can be allocated along with + * the netdev.) + * + * @wiphy: pointer to hardware description + */ +struct wireless_dev { + struct wiphy *wiphy; + + /* private to the generic wireless code */ + struct cfg80211_config pending_config; + struct list_head list; + struct net_device *netdev; +}; + +/** + * wiphy_priv - return priv from wiphy + */ +static inline void *wiphy_priv(struct wiphy *wiphy) +{ + BUG_ON(!wiphy); + return &wiphy->priv; +} + +/** + * set_wiphy_dev - set device pointer for wiphy + */ +static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev) +{ + wiphy->dev.parent = dev; +} + +/** + * wiphy_dev - get wiphy dev pointer + */ +static inline struct device *wiphy_dev(struct wiphy *wiphy) +{ + return wiphy->dev.parent; +} + +/** + * wiphy_name - get wiphy name + */ +static inline char *wiphy_name(struct wiphy *wiphy) +{ + return wiphy->dev.bus_id; +} + +/** + * wdev_priv - return wiphy priv from wireless_dev + */ +static inline void *wdev_priv(struct wireless_dev *wdev) +{ + BUG_ON(!wdev); + return wiphy_priv(wdev->wiphy); +} + +/** + * wiphy_new - create a new wiphy for use with cfg80211 + * + * create a new wiphy and associate the given operations with it. + * @sizeof_priv bytes are allocated for private use. + * + * the returned pointer must be assigned to each netdev's + * ieee80211_ptr for proper operation. + */ +struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv); + +/** + * wiphy_register - register a wiphy with cfg80211 + * + * register the given wiphy + * + * Returns a non-negative wiphy index or a negative error code. + */ +extern int wiphy_register(struct wiphy *wiphy); + +/** + * wiphy_unregister - deregister a wiphy from cfg80211 + * + * unregister a device with the given priv pointer. + * After this call, no more requests can be made with this priv + * pointer, but the call may sleep to wait for an outstanding + * request that is being handled. + */ +extern void wiphy_unregister(struct wiphy *wiphy); + +/** + * wiphy_free - free wiphy + */ +extern void wiphy_free(struct wiphy *wiphy); + + +/* + * internal definitions for wireless + */ + +#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT) +int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg); +int wireless_proc_init(void); +#else +static inline +int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg) +{ + return -EINVAL; +} +static inline int wireless_proc_init(void) +{ + return 0; +} +#endif + +#endif /* __NET_WIRELESS_H */ --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.19.noarch/include/net/mac80211.h 2007-03-02 14:57:04.000000000 -0500 @@ -0,0 +1,1079 @@ +/* + * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface + * Copyright 2002-2005, Devicescape Software, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef MAC80211_H +#define MAC80211_H + +#include +#include +#include +#include +#include +#include +#include +#include + +/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be + * called in hardware interrupt context. The low-level driver must not call any + * other functions in hardware interrupt context. If there is a need for such + * call, the low-level driver should first ACK the interrupt and perform the + * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in + * software interrupt context). + */ + +/* + * Frame format used when passing frame between low-level hardware drivers + * and IEEE 802.11 driver the same as used in the wireless media, i.e., + * buffers start with IEEE 802.11 header and include the same octets that + * are sent over air. + * + * If hardware uses IEEE 802.3 headers (and perform 802.3 <-> 802.11 + * conversion in firmware), upper layer 802.11 code needs to be changed to + * support this. + * + * If the receive frame format is not the same as the real frame sent [...89075 lines suppressed...] + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, + &iwe, buf); + kfree(buf); + } + } + + do { + char *buf, *p; + int i; + + if (!(local->scan_flags & IEEE80211_SCAN_EXTRA_INFO)) + break; + + buf = kmalloc(100, GFP_ATOMIC); + if (!buf) + break; + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "bcn_int=%d", bss->beacon_int); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "rssi=%d", bss->rssi); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "capab=0x%04x", bss->capability); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + /* dispaly all support rates in readable format */ + p = current_ev + IW_EV_LCP_LEN; + iwe.cmd = SIOCGIWRATE; + /* Those two flags are ignored... */ + iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0; + + for (i = 0; i < bss->supp_rates_len; i++) { + iwe.u.bitrate.value = ((bss->supp_rates[i] & + 0x7f) * 500000); + p = iwe_stream_add_value(current_ev, p, + end_buf, &iwe, IW_EV_PARAM_LEN); + } + /* Check if we added any rate */ + if((p - current_ev) > IW_EV_LCP_LEN) + current_ev = p; + + kfree(buf); + break; + } while (0); + + return current_ev; +} + + +int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len) +{ + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + char *current_ev = buf; + char *end_buf = buf + len; + struct ieee80211_sta_bss *bss; + + spin_lock_bh(&local->sta_bss_lock); + list_for_each_entry(bss, &local->sta_bss_list, list) { + if (buf + len - current_ev <= IW_EV_ADDR_LEN) { + spin_unlock_bh(&local->sta_bss_lock); + return -E2BIG; + } + current_ev = ieee80211_sta_scan_result(dev, bss, current_ev, + end_buf); + } + spin_unlock_bh(&local->sta_bss_lock); + return current_ev - buf; +} + + +int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + kfree(ifsta->extra_ie); + if (len == 0) { + ifsta->extra_ie = NULL; + ifsta->extra_ie_len = 0; + return 0; + } + ifsta->extra_ie = kmalloc(len, GFP_KERNEL); + if (!ifsta->extra_ie) { + ifsta->extra_ie_len = 0; + return -ENOMEM; + } + memcpy(ifsta->extra_ie, ie, len); + ifsta->extra_ie_len = len; + return 0; +} + + +struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev, + struct sk_buff *skb, u8 *bssid, + u8 *addr) +{ + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + struct sta_info *sta; + struct ieee80211_sub_if_data *sdata = NULL; + struct net_device *sta_dev = NULL; + + /* TODO: Could consider removing the least recently used entry and + * allow new one to be added. */ + if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) { + if (net_ratelimit()) { + printk(KERN_DEBUG "%s: No room for a new IBSS STA " + "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr)); + } + return NULL; + } + + spin_lock_bh(&local->sub_if_lock); + list_for_each_entry(sdata, &local->sub_if_list, list) + if (sdata->type == IEEE80211_IF_TYPE_IBSS && + memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) { + sta_dev = sdata->dev; + break; + } + spin_unlock_bh(&local->sub_if_lock); + + if (!sta_dev) + return NULL; + + printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n", + dev->name, MAC_ARG(addr), sta_dev->name); + + sta = sta_info_add(local, dev, addr, GFP_ATOMIC); + if (!sta) + return NULL; + + sta->dev = sta_dev; + sta->supp_rates = sdata->u.sta.supp_rates_bits; + + rate_control_rate_init(sta, local); + + return sta; /* caller will call sta_info_put() */ +} + + +int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + + printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n", + dev->name, reason); + + if (sdata->type != IEEE80211_IF_TYPE_STA && + sdata->type != IEEE80211_IF_TYPE_IBSS) + return -EINVAL; + + ieee80211_send_deauth(dev, ifsta, reason); + ieee80211_set_disassoc(dev, ifsta, 1); + return 0; +} + + +int ieee80211_sta_disassociate(struct net_device *dev, u16 reason) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + + printk(KERN_DEBUG "%s: disassociate(reason=%d)\n", + dev->name, reason); + + if (sdata->type != IEEE80211_IF_TYPE_STA) + return -EINVAL; + + if (!ifsta->associated) + return -1; + + ieee80211_send_disassoc(dev, ifsta, reason); + ieee80211_set_disassoc(dev, ifsta, 0); + return 0; +} --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_cfg.h 2007-03-02 14:57:05.000000000 -0500 @@ -0,0 +1,9 @@ +/* + * mac80211 configuration hooks for cfg80211 + */ +#ifndef __IEEE80211_CFG_H +#define __IEEE80211_CFG_H + +extern struct cfg80211_ops mac80211_config_ops; + +#endif /* __IEEE80211_CFG_H */ jwltest-prism54-wpa-fix.patch: isl_ioctl.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletion(-) --- NEW FILE jwltest-prism54-wpa-fix.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-02-05 10:33:42.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-02-05 10:34:23.000000000 -0500 @@ -1395,11 +1395,17 @@ static int prism54_set_auth(struct net_d break; case IW_AUTH_RX_UNENCRYPTED_EAPOL: - dot1x = param->value ? 1 : 0; + /* Don't allow turning on dot1x in WEP or unencrypted mode; + * it appears to make all associations fail. + */ + if (!wpa && param->value) + break; + dot1x = param->value ? 0x01 : 0; break; case IW_AUTH_PRIVACY_INVOKED: privinvoked = param->value ? 1 : 0; + break; case IW_AUTH_DROP_UNENCRYPTED: exunencrypt = param->value ? 1 : 0; @@ -1589,6 +1595,7 @@ static int prism54_set_encodeext(struct } key.type = DOT11_PRIV_TKIP; key.length = KEY_SIZE_TKIP; + break; default: return -EINVAL; } jwltest-softmac_wx_get_rate-running-check.patch: ieee80211softmac_wx.c | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE jwltest-softmac_wx_get_rate-running-check.patch --- --- linux-2.6.18.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig 2006-12-12 13:16:33.000000000 -0500 +++ linux-2.6.18.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c 2006-12-12 13:22:05.000000000 -0500 @@ -265,6 +265,12 @@ ieee80211softmac_wx_get_rate(struct net_ int err = -EINVAL; spin_lock_irqsave(&mac->lock, flags); + + if (unlikely(!mac->running)) { + err = -ENODEV; + goto out_unlock; + } + switch (mac->txrates.default_rate) { case IEEE80211_CCK_RATE_1MB: data->bitrate.value = 1000000; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2911 retrieving revision 1.2911.12.1 diff -u -r1.2911 -r1.2911.12.1 --- kernel-2.6.spec 10 Feb 2007 19:48:27 -0000 1.2911 +++ kernel-2.6.spec 2 Mar 2007 20:55:33 -0000 1.2911.12.1 @@ -33,7 +33,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}.jwltest.24 %define signmodules 0 %define xen_hv_cset 11774 %define make_target bzImage @@ -411,6 +411,12 @@ # core networking changes. # NIC driver fixes +Patch1350: jwltest-bcm43xx-2_6_20.patch +Patch1351: jwltest-bcm43xx-workqueue-undo.patch +Patch1352: jwltest-bcm43xx-host_strip_iv_icv-undo.patch +Patch1353: jwltest-bcm43xx-post-2_6_20.patch +Patch1354: jwltest-softmac_wx_get_rate-running-check.patch +Patch1355: jwltest-prism54-wpa-fix.patch # Filesystem stuff. # Squashfs @@ -491,6 +497,14 @@ Patch5060: linux-2.6-olpc-battery.patch # +# mac80211 backport +# +Patch6000: jwltest-mac80211-backport.patch +Patch6001: jwltest-mac80211-backport-2_6_19-fixup.patch +Patch6002: jwltest-iwlwifi.patch +Patch6003: jwltest-iwlwifi-2_6_19-fixup.patch + +# # 10000 to 20000 is for stuff that has to come last due to the # amount of drivers they touch. But only these should go here. # Not patches you're too lazy for to put in the proper place. @@ -975,6 +989,18 @@ # core networking changes. # NIC driver fixes +# bcm43xx: update to version from 2.6.20 +%patch1350 -p1 +# bcm43xx: revert workqueue-related changes +%patch1351 -p1 +# bcm43xx: revert host_strip_iv_icv-related changes +%patch1352 -p1 +# bcm43xx: update to version from 2007-02-08 +%patch1353 -p1 +# check mac->running to avoid assert in ieee80211softmac_wx_get_rate +%patch1354 -p1 +# prism54: fix WPA support (dcbw) +%patch1355 -p1 # Filesystem patches. # Squashfs @@ -1105,6 +1131,12 @@ # final stuff # +# mac80211 stuff +%patch6000 -p1 +%patch6001 -p1 +%patch6002 -p1 +%patch6003 -p1 + # # misc small stuff to make things compile or otherwise improve performance # From fedora-cvs-commits at redhat.com Fri Mar 2 21:10:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 16:10:26 -0500 Subject: rpms/kernel/FC-5 patch-2.6.19.4-5.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.431.2.1, 1.431.2.2 kernel-2.6.spec, 1.2288.2.1, 1.2288.2.2 linux-2.6-defaults-disable-split-ptlock.patch, 1.6.2.1, 1.6.2.2 linux-2.6-devmem.patch, 1.10.2.1, 1.10.2.2 linux-2.6-xen.patch, 1.31, 1.31.2.1 sources, 1.371.2.1, 1.371.2.2 upstream, 1.335.2.1, 1.335.2.2 linux-2.6-revert-cx88-freezer.patch, 1.1.2.1, NONE patch-2.6.19.5-rc1.bz2.sign, 1.1.2.1, NONE Message-ID: <200703022110.l22LAQeB006162@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6084 Modified Files: Tag: kernel-2_6_19-1_2288_fc5_stable .cvsignore kernel-2.6.spec linux-2.6-defaults-disable-split-ptlock.patch linux-2.6-devmem.patch linux-2.6-xen.patch sources upstream Added Files: Tag: kernel-2_6_19-1_2288_fc5_stable patch-2.6.19.4-5.bz2.sign Removed Files: Tag: kernel-2_6_19-1_2288_fc5_stable linux-2.6-revert-cx88-freezer.patch patch-2.6.19.5-rc1.bz2.sign Log Message: * Fri Mar 2 2007 Chuck Ebbert - 2.6.19.5 - re-enable Xen --- NEW FILE patch-2.6.19.4-5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF37NayGugalF9Dw4RAiQLAJ0cmGOqCmG1TQUXCgLVA7Vblz37LQCfUi1w 6UHcHaDy3VDPmWD/F9GKHqg= =knyC -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v retrieving revision 1.431.2.1 retrieving revision 1.431.2.2 diff -u -r1.431.2.1 -r1.431.2.2 --- .cvsignore 22 Feb 2007 15:21:52 -0000 1.431.2.1 +++ .cvsignore 2 Mar 2007 21:10:23 -0000 1.431.2.2 @@ -6,4 +6,4 @@ xen-3.0.3-11774.tar.bz2 patch-2.6.19.3.bz2 patch-2.6.19.3-4.bz2 -patch-2.6.19.5-rc1.bz2 +patch-2.6.19.4-5.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2288.2.1 retrieving revision 1.2288.2.2 diff -u -r1.2288.2.1 -r1.2288.2.2 --- kernel-2.6.spec 22 Feb 2007 15:21:52 -0000 1.2288.2.1 +++ kernel-2.6.spec 2 Mar 2007 21:10:23 -0000 1.2288.2.2 @@ -8,7 +8,7 @@ %define buildsmp 0 %define buildpae 0 # Whether to apply the Xen patches, leave this enabled. -%define includexen 0 +%define includexen 1 # Whether to build the Xen kernels, disable if you want. %define buildxen 1 %define builddoc 0 @@ -312,10 +312,7 @@ # Patch1: patch-2.6.19.3.bz2 Patch2: patch-2.6.19.3-4.bz2 -Patch3: patch-2.6.19.5-rc1.bz2 - -# reverse part of the -rc1 patch -- it's broken -Patch4: linux-2.6-revert-cx88-freezer.patch +Patch3: patch-2.6.19.4-5.bz2 # Patches 10 through 99 are for things that are going upstream really soon. @@ -831,9 +828,6 @@ %patch2 -p1 %patch3 -p1 -# revert broken part of -rc1 patch -%patch4 -p1 -R - # Patches 10 through 100 are meant for core subsystem upgrades # sysrq works always @@ -1847,6 +1841,10 @@ %endif %changelog +* Fri Mar 2 2007 Chuck Ebbert +- 2.6.19.5 +- re-enable Xen + * Thu Feb 22 2007 Chuck Ebbert - 2.6.19.4 (CVE-2007-0772) - 2.6.19.5-rc1 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.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- linux-2.6-defaults-disable-split-ptlock.patch 22 Feb 2007 15:21:52 -0000 1.6.2.1 +++ linux-2.6-defaults-disable-split-ptlock.patch 2 Mar 2007 21:10:23 -0000 1.6.2.2 @@ -6,6 +6,6 @@ default "4096" if ARM && !CPU_CACHE_VIPT default "4096" if PARISC && !PA20 + 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.10.2.1 retrieving revision 1.10.2.2 diff -u -r1.10.2.1 -r1.10.2.2 --- linux-2.6-devmem.patch 22 Feb 2007 15:21:52 -0000 1.10.2.1 +++ linux-2.6-devmem.patch 2 Mar 2007 21:10:23 -0000 1.10.2.2 @@ -446,12 +446,13 @@ --- 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 - (((current->personality & READ_IMPLIES_EXEC) != 0) \ - ? VM_EXEC : 0)) + #endif /* CONFIG_XEN */ + #endif /* __ASSEMBLY__ */ +#define devmem_is_allowed(x) 1 - # endif /* __KERNEL__ */ + #endif /* __KERNEL__ */ #endif /* _ASM_IA64_PAGE_H */ + =================================================================== --- linux-2.6.orig/include/asm-m68k/page.h +++ linux-2.6/include/asm-m68k/page.h 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 | 12 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, 90724 insertions(+), 202 deletions(-) Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -u -r1.31 -r1.31.2.1 --- linux-2.6-xen.patch 31 Jan 2007 15:26:15 -0000 1.31 +++ linux-2.6-xen.patch 2 Mar 2007 21:10:24 -0000 1.31.2.1 @@ -35219,18 +35219,32 @@ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/x86_64/kernel/irq.c source/arch/x86_64/kernel/irq.c --- /scratch/src/linux-2.6.19.2/arch/x86_64/kernel/irq.c 2006-11-29 22:57:37.000000000 +0100 +++ source/arch/x86_64/kernel/irq.c 2006-12-23 17:44:42.000000000 +0100 -@@ -112,7 +112,11 @@ asmlinkage unsigned int do_IRQ(struct pt - - exit_idle(); - irq_enter(); -+#ifdef CONFIG_XEN -+ irq = vector; -+#else - irq = __get_cpu_var(vector_irq)[vector]; -+#endif - - #ifdef CONFIG_DEBUG_STACKOVERFLOW - stack_overflow_check(regs); +@@ -100,7 +100,11 @@ skip: + static inline unsigned int irq_from_vector(unsigned int vector) + { + int irq; +- irq = __get_cpu_var(vector_irq)[vector]; ++ #ifdef CONFIG_XEN ++ irq = vector; ++ #else ++ irq = __get_cpu_var(vector_irq)[vector]; ++ #endif + + /* If we changed vectors during migration and we had a pending + * irq, we left the irq allocated on this cpu. Now that the +@@ -108,7 +112,11 @@ static inline unsigned int irq_from_vect + * vector. + */ + if (irq < -1) { +- __get_cpu_var(vector_irq)[vector] = -1; ++ #ifdef CONFIG_XEN ++ vector = -1; ++ #else ++ __get_cpu_var(vector_irq)[vector] = -1; ++ #endif + irq = -irq; + } + return irq; diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/x86_64/kernel/irqflags-xen.c source/arch/x86_64/kernel/irqflags-xen.c --- /scratch/src/linux-2.6.19.2/arch/x86_64/kernel/irqflags-xen.c 1970-01-01 01:00:00.000000000 +0100 +++ source/arch/x86_64/kernel/irqflags-xen.c 2006-12-23 17:42:20.000000000 +0100 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v retrieving revision 1.371.2.1 retrieving revision 1.371.2.2 diff -u -r1.371.2.1 -r1.371.2.2 --- sources 22 Feb 2007 15:21:52 -0000 1.371.2.1 +++ sources 2 Mar 2007 21:10:24 -0000 1.371.2.2 @@ -2,4 +2,4 @@ a9d44b2651b0898e103395b2a7a4f263 xen-3.0.3-11774.tar.bz2 ef8491f189893c250a61cea825de025c patch-2.6.19.3.bz2 32d58db1efaddc9af079c04a6409bc2e patch-2.6.19.3-4.bz2 -a2769552cb887b49c281c261c0192cb1 patch-2.6.19.5-rc1.bz2 +349195718c3850c34e18c71004e1d4c7 patch-2.6.19.4-5.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v retrieving revision 1.335.2.1 retrieving revision 1.335.2.2 diff -u -r1.335.2.1 -r1.335.2.2 --- upstream 22 Feb 2007 15:21:52 -0000 1.335.2.1 +++ upstream 2 Mar 2007 21:10:24 -0000 1.335.2.2 @@ -1,4 +1,4 @@ linux-2.6.19.tar.bz2 patch-2.6.19.3.bz2 patch-2.6.19.3-4.bz2 -patch-2.6.19.5-rc1.bz2 +patch-2.6.19.4-5.bz2 --- linux-2.6-revert-cx88-freezer.patch DELETED --- --- patch-2.6.19.5-rc1.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 2 21:22:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 16:22:19 -0500 Subject: rpms/kernel/FC-6 jwltest-mac80211-backport-2_6_19-fixup.patch, 1.1.4.1, 1.1.4.2 Message-ID: <200703022122.l22LMJiY008028@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7986 Modified Files: Tag: private-linville-jwltest-fc6-24-branch jwltest-mac80211-backport-2_6_19-fixup.patch Log Message: jwltest-mac80211-backport-2_6_19-fixup.patch: drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 2 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 20 +-- drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 8 - drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 6 - drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 14 +- drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 2 net/mac80211/ieee80211.c | 8 - net/mac80211/ieee80211_i.h | 7 - net/mac80211/ieee80211_iface.c | 2 net/mac80211/ieee80211_sta.c | 28 ++--- net/mac80211/ieee80211_sysfs.c | 105 +++++++++---------- net/mac80211/ieee80211_sysfs_sta.c | 2 net/mac80211/sta_info.c | 7 - net/mac80211/wep.c | 1 net/mac80211/wme.c | 5 net/wireless/core.c | 4 net/wireless/nl80211.c | 3 26 files changed, 257 insertions(+), 316 deletions(-) Index: jwltest-mac80211-backport-2_6_19-fixup.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/Attic/jwltest-mac80211-backport-2_6_19-fixup.patch,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -u -r1.1.4.1 -r1.1.4.2 --- jwltest-mac80211-backport-2_6_19-fixup.patch 2 Mar 2007 20:55:32 -0000 1.1.4.1 +++ jwltest-mac80211-backport-2_6_19-fixup.patch 2 Mar 2007 21:22:17 -0000 1.1.4.2 @@ -1,5 +1,5 @@ ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h 2007-03-02 16:16:05.000000000 -0500 @@ -742,7 +742,7 @@ struct bcm43xx_wldev { struct tasklet_struct isr_tasklet; @@ -9,8 +9,8 @@ unsigned int periodic_state; struct work_struct restart_work; ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c 2007-03-02 16:16:05.000000000 -0500 @@ -2284,10 +2284,9 @@ static int estimate_periodic_work_badnes return badness; } @@ -65,8 +65,8 @@ bcm43xx_radio_turn_off(dev); bcm43xx_switch_analog(dev, 0); ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h 2007-03-02 16:16:05.000000000 -0500 @@ -1226,9 +1226,9 @@ static void rt2500pci_disable_radio(stru /* * Interrupt functions. @@ -80,8 +80,8 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance); #endif /* RT2500PCI_H */ ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c 2007-03-02 16:16:05.000000000 -0500 @@ -724,12 +724,9 @@ static void rt2500usb_config_mac_address /* * Link tuning @@ -243,8 +243,8 @@ /* * Reset current working type. ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h 2007-03-02 16:16:05.000000000 -0500 @@ -686,7 +686,7 @@ struct link { /* * Work structure for scheduling periodic link tuning. @@ -267,8 +267,8 @@ * Completion structure if an packet needs to be send. */ struct completion completion; ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h 2007-03-02 16:16:05.000000000 -0500 @@ -1390,9 +1390,9 @@ static void rt61pci_disable_radio(struct /* * Interrupt functions. @@ -282,8 +282,8 @@ static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance); #endif /* RT61PCI_H */ ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c 2007-03-02 16:16:05.000000000 -0500 @@ -692,12 +692,9 @@ static void rt2500pci_config_mac_address /* * Link tuning @@ -445,8 +445,8 @@ /* * Reset current working type. ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h 2007-03-02 16:16:05.000000000 -0500 @@ -731,9 +731,9 @@ static void rt2500usb_disable_radio(stru /* * Interrupt functions. @@ -460,8 +460,8 @@ static void rt2500usb_interrupt(struct urb *urb); #endif /* RT2500USB_H */ ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c 2007-03-02 16:16:05.000000000 -0500 @@ -916,12 +916,9 @@ static void rt61pci_config_mac_address(s /* * Link tuning @@ -623,8 +623,8 @@ /* * Reset current working type. ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h 2007-03-02 16:16:05.000000000 -0500 @@ -972,9 +972,9 @@ static void rt73usb_disable_radio(struct /* * Interrupt functions. @@ -638,8 +638,8 @@ static void rt73usb_interrupt(struct urb *urb); #endif /* RT73USB_H */ ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h 2007-03-02 16:16:05.000000000 -0500 @@ -959,9 +959,9 @@ static void rt2400pci_disable_radio(stru /* * Interrupt functions. @@ -653,8 +653,8 @@ static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance); #endif /* RT2400PCI_H */ ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-03-02 16:16:05.000000000 -0500 @@ -814,12 +814,9 @@ static void rt73usb_config_mac_address(s /* * Link tuning @@ -816,8 +816,8 @@ /* * Reset current working type. ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c 2007-03-02 16:16:05.000000000 -0500 @@ -617,12 +617,9 @@ static void rt2400pci_config_mac_address /* * Link tuning @@ -983,8 +983,8 @@ /* * Reset current working type. ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c 2007-03-02 16:16:05.000000000 -0500 @@ -552,10 +552,9 @@ static int zd_mac_config_interface(struc return 0; } @@ -1029,8 +1029,8 @@ } static void housekeeping_enable(struct zd_mac *mac) ---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h 2007-03-02 16:16:05.000000000 -0500 @@ -119,7 +119,7 @@ enum mac_flags { }; @@ -1040,8 +1040,8 @@ }; #define ZD_MAC_STATS_BUFFER_SIZE 16 ---- linux-2.6.19.noarch/net/wireless/nl80211.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/wireless/nl80211.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/net/wireless/nl80211.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/wireless/nl80211.c 2007-03-02 16:16:05.000000000 -0500 @@ -1002,7 +1002,8 @@ static struct genl_ops nl80211_ops[] = { void *nl80211hdr_put(struct sk_buff *skb, u32 pid, u32 seq, int flags, u8 cmd) { @@ -1052,8 +1052,28 @@ } EXPORT_SYMBOL_GPL(nl80211hdr_put); ---- linux-2.6.19.noarch/net/mac80211/wme.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/mac80211/wme.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/net/wireless/core.c.orig 2007-03-02 16:21:41.000000000 -0500 ++++ linux-2.6.19.noarch/net/wireless/core.c 2007-03-02 16:18:49.000000000 -0500 +@@ -255,7 +255,7 @@ static int cfg80211_netdev_notifier_call + case NETDEV_REGISTER: + mutex_lock(&rdev->devlist_mtx); + list_add(&dev->ieee80211_ptr->list, &rdev->netdev_list); +- if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, ++ if (sysfs_create_link(&dev->class_dev.kobj, &rdev->wiphy.dev.kobj, + "phy80211")) { + printk(KERN_ERR "wireless: failed to add phy80211 symlink to netdev!\n"); + } +@@ -264,7 +264,7 @@ static int cfg80211_netdev_notifier_call + break; + case NETDEV_UNREGISTER: + mutex_lock(&rdev->devlist_mtx); +- sysfs_remove_link(&dev->dev.kobj, "phy80211"); ++ sysfs_remove_link(&dev->class_dev.kobj, "phy80211"); + list_del(&dev->ieee80211_ptr->list); + mutex_unlock(&rdev->devlist_mtx); + break; +--- linux-2.6.19.noarch/net/mac80211/wme.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/mac80211/wme.c 2007-03-02 16:16:05.000000000 -0500 @@ -417,8 +417,7 @@ static int wme_qdiscop_init(struct Qdisc /* create child queues */ for (i = 0; i < queues; i++) { @@ -1073,8 +1093,8 @@ if (!qdisc) { printk(KERN_ERR "%s: qdisc installation failed\n", dev->name); return; ---- linux-2.6.19.noarch/net/mac80211/ieee80211_i.h.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/mac80211/ieee80211_i.h 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/net/mac80211/ieee80211_i.h.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/mac80211/ieee80211_i.h 2007-03-02 16:16:05.000000000 -0500 @@ -443,8 +443,7 @@ struct ieee80211_local { int scan_channel_idx; enum { SCAN_SET_CHANNEL, SCAN_SEND_PROBE } scan_state; @@ -1096,8 +1116,8 @@ void ieee80211_sta_rx_mgmt(struct net_device *dev, struct sk_buff *skb, struct ieee80211_rx_status *rx_status); int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len); ---- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c 2007-03-02 15:05:19.000000000 -0500 +--- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c 2007-03-02 16:16:05.000000000 -0500 @@ -24,6 +24,9 @@ static inline struct ieee80211_local *to return wiphy_priv(wiphy); } @@ -1271,8 +1291,8 @@ - ieee80211_remove_if_group(&dev->dev.kobj, dev); + ieee80211_remove_if_group(&dev->class_dev.kobj, dev); } ---- linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c 2007-03-02 16:16:05.000000000 -0500 @@ -181,7 +181,7 @@ void ieee80211_if_set_type(struct net_de struct ieee80211_if_sta *ifsta; @@ -1282,8 +1302,8 @@ setup_timer(&ifsta->timer, ieee80211_sta_timer, (unsigned long) ifsta); skb_queue_head_init(&ifsta->skb_queue); ---- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c 2007-03-02 16:16:05.000000000 -0500 @@ -387,7 +387,7 @@ int ieee80211_key_kset_sysfs_register(st res = kobject_set_name(&sdata->key_kset.kobj, "keys"); if (res) @@ -1293,8 +1313,8 @@ sdata->key_kset.ktype = &key_ktype; return kset_register(&sdata->key_kset); } ---- linux-2.6.19.noarch/net/mac80211/sta_info.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/mac80211/sta_info.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/net/mac80211/sta_info.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/mac80211/sta_info.c 2007-03-02 16:16:05.000000000 -0500 @@ -342,10 +342,9 @@ static void sta_info_cleanup(unsigned lo } @@ -1317,8 +1337,8 @@ } int sta_info_start(struct ieee80211_local *local) ---- linux-2.6.19.noarch/net/mac80211/wep.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/mac80211/wep.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/net/mac80211/wep.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/mac80211/wep.c 2007-03-02 16:16:05.000000000 -0500 @@ -15,7 +15,6 @@ #include #include @@ -1327,8 +1347,8 @@ #include #include ---- linux-2.6.19.noarch/net/mac80211/ieee80211.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/mac80211/ieee80211.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/net/mac80211/ieee80211.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/mac80211/ieee80211.c 2007-03-02 16:16:05.000000000 -0500 @@ -2199,13 +2199,13 @@ void ieee80211_if_shutdown(struct net_de flush_scheduled_work(); skb_queue_purge(&sdata->u.sta.skb_queue); @@ -1363,8 +1383,8 @@ local->sta_scanning = 0; cancel_delayed_work(&local->scan_work); flush_scheduled_work(); ---- linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c.orig 2007-03-02 14:58:57.000000000 -0500 -+++ linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c 2007-03-02 15:00:06.000000000 -0500 +--- linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c.orig 2007-03-02 16:15:56.000000000 -0500 ++++ linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c 2007-03-02 16:16:05.000000000 -0500 @@ -1898,11 +1898,10 @@ void ieee80211_sta_timer(unsigned long d } From fedora-cvs-commits at redhat.com Fri Mar 2 21:23:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 16:23:28 -0500 Subject: rpms/kernel/devel/configs config-generic,1.297,1.297.2.1 Message-ID: <200703022123.l22LNSEj009050@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv8986/configs Modified Files: Tag: private-linville-jwltest-fc7-3-branch config-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.297 retrieving revision 1.297.2.1 diff -u -r1.297 -r1.297.2.1 --- config-generic 2 Mar 2007 20:34:02 -0000 1.297 +++ config-generic 2 Mar 2007 21:23:26 -0000 1.297.2.1 @@ -1240,6 +1240,8 @@ # CONFIG_ZD1211RW_MAC80211_DEBUG is not set CONFIG_RTL818X=y CONFIG_RTL8187=m +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_DEBUG=y CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m From fedora-cvs-commits at redhat.com Fri Mar 2 21:23:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 16:23:28 -0500 Subject: rpms/kernel/devel jwltest-git-wireless-dev.patch, NONE, 1.1.4.1 jwltest-iwlwifi.patch, NONE, 1.1.4.1 kernel-2.6.spec, 1.2961, 1.2961.2.1 Message-ID: <200703022123.l22LNSBC009040@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8986 Modified Files: Tag: private-linville-jwltest-fc7-3-branch kernel-2.6.spec Added Files: Tag: private-linville-jwltest-fc7-3-branch jwltest-git-wireless-dev.patch jwltest-iwlwifi.patch Log Message: jwltest-git-wireless-dev.patch: CREDITS | 33 MAINTAINERS | 54 drivers/Kconfig | 2 drivers/Makefile | 1 drivers/net/wireless/Kconfig | 2 drivers/net/wireless/Makefile | 3 drivers/net/wireless/mac80211/Kconfig | 6 drivers/net/wireless/mac80211/Makefile | 6 drivers/net/wireless/mac80211/README | 2 drivers/net/wireless/mac80211/adm8211/Kconfig | 24 drivers/net/wireless/mac80211/adm8211/Makefile | 1 drivers/net/wireless/mac80211/adm8211/adm8211.c | 2188 +++++++ drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 ++ drivers/net/wireless/mac80211/bcm43xx/Kconfig | 99 drivers/net/wireless/mac80211/bcm43xx/Makefile | 17 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 870 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1297 ++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1051 +++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 89 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 3962 ++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pci.c | 61 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pci.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4234 +++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 307 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.c | 202 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.h | 83 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 615 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 215 drivers/net/wireless/mac80211/p54/Kconfig | 9 drivers/net/wireless/mac80211/p54/Makefile | 4 drivers/net/wireless/mac80211/p54/net2280.h | 452 + drivers/net/wireless/mac80211/p54/prism54.h | 77 drivers/net/wireless/mac80211/p54/prism54common.c | 807 ++ drivers/net/wireless/mac80211/p54/prism54common.h | 304 drivers/net/wireless/mac80211/p54/prism54magic.h | 77 drivers/net/wireless/mac80211/p54/prism54pci.c | 698 ++ drivers/net/wireless/mac80211/p54/prism54pci.h | 106 drivers/net/wireless/mac80211/p54/prism54usb.c | 946 +++ drivers/net/wireless/mac80211/p54/prism54usb.h | 133 drivers/net/wireless/mac80211/rt2x00/Kconfig | 83 drivers/net/wireless/mac80211/rt2x00/Makefile | 5 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 2985 +++++++++ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 967 +++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 3297 ++++++++++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1234 +++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 3131 ++++++++++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 739 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1268 ++++ drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 44 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 81 drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 3827 ++++++++++++ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1398 ++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 3467 +++++++++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 980 +++ drivers/net/wireless/mac80211/rtl818x/Kconfig | 8 drivers/net/wireless/mac80211/rtl818x/Makefile | 2 drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 712 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 738 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 28 drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 175 drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19 drivers/net/wireless/mac80211/zd1211rw/Makefile | 11 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1674 +++++ drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 909 ++ drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 705 ++ drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 156 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 81 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 373 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 274 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1324 ++++ drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241 drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82 drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29 drivers/ssb/Kconfig | 93 drivers/ssb/Makefile | 14 drivers/ssb/core.c | 956 +++ drivers/ssb/driver_chipcommon/chipcommon.c | 402 + drivers/ssb/driver_mips/mips.c | 258 drivers/ssb/driver_pci/pcicore.c | 556 + drivers/ssb/pci.c | 667 ++ drivers/ssb/pcihost_wrapper.c | 104 drivers/ssb/pcmcia.c | 256 drivers/ssb/scan.c | 427 + drivers/ssb/ssb_private.h | 152 drivers/usb/host/Kconfig | 10 drivers/usb/host/ohci-hcd.c | 4 drivers/usb/host/ohci-ssb.c | 193 include/linux/Kbuild | 2 include/linux/crc-itu-t.h | 27 include/linux/eeprom_93cx6.h | 77 include/linux/ieee80211.h | 330 + include/linux/netdevice.h | 7 include/linux/nl80211.h | 275 include/linux/ssb/ssb.h | 388 + include/linux/ssb/ssb_driver_chipcommon.h | 387 + include/linux/ssb/ssb_driver_extif.h | 163 include/linux/ssb/ssb_driver_mips.h | 47 include/linux/ssb/ssb_driver_pci.h | 108 include/linux/ssb/ssb_regs.h | 294 include/net/cfg80211.h | 169 include/net/iw_handler.h | 3 include/net/mac80211.h | 1079 +++ include/net/wireless.h | 153 lib/Kconfig | 16 lib/Makefile | 3 lib/crc-itu-t.c | 64 lib/eeprom_93cx6.c | 344 + net/Kconfig | 3 net/Makefile | 2 net/core/Makefile | 1 net/core/dev.c | 33 net/core/wireless.c | 2353 ------- net/mac80211/Kconfig | 73 net/mac80211/Makefile | 26 net/mac80211/aes_ccm.c | 155 net/mac80211/aes_ccm.h | 26 net/mac80211/fifo_qdisc.c | 102 net/mac80211/hostapd_ioctl.h | 434 + net/mac80211/ieee80211.c | 4940 ++++++++++++++++ net/mac80211/ieee80211_cfg.c | 90 net/mac80211/ieee80211_cfg.h | 9 net/mac80211/ieee80211_common.h | 98 net/mac80211/ieee80211_i.h | 720 ++ net/mac80211/ieee80211_iface.c | 372 + net/mac80211/ieee80211_ioctl.c | 3304 ++++++++++ net/mac80211/ieee80211_key.h | 89 net/mac80211/ieee80211_led.c | 91 net/mac80211/ieee80211_led.h | 32 net/mac80211/ieee80211_rate.c | 140 net/mac80211/ieee80211_rate.h | 161 net/mac80211/ieee80211_scan.c | 344 + net/mac80211/ieee80211_sta.c | 3013 +++++++++ net/mac80211/ieee80211_sysfs.c | 718 ++ net/mac80211/ieee80211_sysfs.h | 12 net/mac80211/ieee80211_sysfs_sta.c | 438 + net/mac80211/michael.c | 104 net/mac80211/michael.h | 20 net/mac80211/rc80211_simple.c | 399 + net/mac80211/sta_info.c | 461 + net/mac80211/sta_info.h | 150 net/mac80211/tkip.c | 341 + net/mac80211/tkip.h | 36 net/mac80211/wep.c | 328 + net/mac80211/wep.h | 40 net/mac80211/wme.c | 679 ++ net/mac80211/wme.h | 38 net/mac80211/wpa.c | 846 ++ net/mac80211/wpa.h | 34 net/wireless/Kconfig | 31 net/wireless/Makefile | 17 net/wireless/core.c | 321 + net/wireless/core.h | 77 net/wireless/nl80211.c | 1051 +++ net/wireless/nl80211.h | 17 net/wireless/sysfs.c | 125 net/wireless/sysfs.h | 9 net/wireless/wext-common.c | 663 ++ net/wireless/wext-compat.c | 819 ++ net/wireless/wext-export.c | 29 net/wireless/wext-mod.c | 20 net/wireless/wext-old.c | 1461 ++++ net/wireless/wext.h | 51 183 files changed, 86301 insertions(+), 2390 deletions(-) --- NEW FILE jwltest-git-wireless-dev.patch --- This corresponds to commit 2c6cea456725655a2d94fbca97a2dacbc00839e4 on the master branch of wireless-dev. --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.20.noarch/include/net/wireless.h 2007-03-02 16:02:57.000000000 -0500 @@ -0,0 +1,153 @@ +#ifndef __NET_WIRELESS_H +#define __NET_WIRELESS_H + +/* + * 802.11 device management + * + * Copyright 2007 Johannes Berg + */ + +#include +#include +#include +#include + +/** + * struct wiphy - wireless hardware description + * @idx: the wiphy index assigned to this item + * @class_dev: the class device representing /sys/class/ieee80211/ + */ +struct wiphy { + /* assign these fields before you register the wiphy */ + + /* permanent MAC address */ + u8 perm_addr[ETH_ALEN]; + + /* fields below are read-only, assigned by cfg80211 */ + + /* the item in /sys/class/ieee80211/ points to this, + * you need use set_wiphy_dev() (see below) */ + struct device dev; + + /* dir in debugfs: ieee80211/ */ + struct dentry *debugfsdir; + + char priv[0] __attribute__((__aligned__(NETDEV_ALIGN))); +}; + +/** struct wireless_dev - wireless per-netdev state + * + * This structure must be allocated by the driver/stack + * that uses the ieee80211_ptr field in struct net_device + * (this is intentional so it can be allocated along with + * the netdev.) + * + * @wiphy: pointer to hardware description + */ +struct wireless_dev { + struct wiphy *wiphy; + + /* private to the generic wireless code */ + struct cfg80211_config pending_config; + struct list_head list; + struct net_device *netdev; +}; + +/** + * wiphy_priv - return priv from wiphy + */ +static inline void *wiphy_priv(struct wiphy *wiphy) +{ + BUG_ON(!wiphy); + return &wiphy->priv; +} + +/** + * set_wiphy_dev - set device pointer for wiphy + */ +static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev) +{ + wiphy->dev.parent = dev; +} + +/** + * wiphy_dev - get wiphy dev pointer + */ +static inline struct device *wiphy_dev(struct wiphy *wiphy) +{ + return wiphy->dev.parent; +} + +/** + * wiphy_name - get wiphy name + */ +static inline char *wiphy_name(struct wiphy *wiphy) +{ + return wiphy->dev.bus_id; +} + +/** + * wdev_priv - return wiphy priv from wireless_dev + */ +static inline void *wdev_priv(struct wireless_dev *wdev) +{ + BUG_ON(!wdev); + return wiphy_priv(wdev->wiphy); +} + +/** + * wiphy_new - create a new wiphy for use with cfg80211 + * + * create a new wiphy and associate the given operations with it. + * @sizeof_priv bytes are allocated for private use. + * + * the returned pointer must be assigned to each netdev's + * ieee80211_ptr for proper operation. + */ +struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv); + +/** + * wiphy_register - register a wiphy with cfg80211 + * + * register the given wiphy + * + * Returns a non-negative wiphy index or a negative error code. + */ +extern int wiphy_register(struct wiphy *wiphy); + +/** + * wiphy_unregister - deregister a wiphy from cfg80211 + * + * unregister a device with the given priv pointer. + * After this call, no more requests can be made with this priv + * pointer, but the call may sleep to wait for an outstanding + * request that is being handled. + */ +extern void wiphy_unregister(struct wiphy *wiphy); + +/** + * wiphy_free - free wiphy + */ +extern void wiphy_free(struct wiphy *wiphy); + + +/* + * internal definitions for wireless + */ + +#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT) +int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg); +int wireless_proc_init(void); +#else +static inline +int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg) +{ + return -EINVAL; +} +static inline int wireless_proc_init(void) +{ + return 0; +} +#endif + +#endif /* __NET_WIRELESS_H */ --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.20.noarch/include/net/mac80211.h 2007-03-02 16:02:57.000000000 -0500 @@ -0,0 +1,1079 @@ +/* + * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface + * Copyright 2002-2005, Devicescape Software, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef MAC80211_H +#define MAC80211_H + +#include +#include +#include +#include +#include +#include +#include +#include + +/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be + * called in hardware interrupt context. The low-level driver must not call any + * other functions in hardware interrupt context. If there is a need for such + * call, the low-level driver should first ACK the interrupt and perform the + * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in + * software interrupt context). + */ + +/* + * Frame format used when passing frame between low-level hardware drivers + * and IEEE 802.11 driver the same as used in the wireless media, i.e., + * buffers start with IEEE 802.11 header and include the same octets that + * are sent over air. + * + * If hardware uses IEEE 802.3 headers (and perform 802.3 <-> 802.11 + * conversion in firmware), upper layer 802.11 code needs to be changed to [...89125 lines suppressed...] + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, + &iwe, buf); + kfree(buf); + } + } + + do { + char *buf, *p; + int i; + + if (!(local->scan_flags & IEEE80211_SCAN_EXTRA_INFO)) + break; + + buf = kmalloc(100, GFP_ATOMIC); + if (!buf) + break; + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "bcn_int=%d", bss->beacon_int); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "rssi=%d", bss->rssi); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "capab=0x%04x", bss->capability); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + /* dispaly all support rates in readable format */ + p = current_ev + IW_EV_LCP_LEN; + iwe.cmd = SIOCGIWRATE; + /* Those two flags are ignored... */ + iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0; + + for (i = 0; i < bss->supp_rates_len; i++) { + iwe.u.bitrate.value = ((bss->supp_rates[i] & + 0x7f) * 500000); + p = iwe_stream_add_value(current_ev, p, + end_buf, &iwe, IW_EV_PARAM_LEN); + } + /* Check if we added any rate */ + if((p - current_ev) > IW_EV_LCP_LEN) + current_ev = p; + + kfree(buf); + break; + } while (0); + + return current_ev; +} + + +int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len) +{ + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + char *current_ev = buf; + char *end_buf = buf + len; + struct ieee80211_sta_bss *bss; + + spin_lock_bh(&local->sta_bss_lock); + list_for_each_entry(bss, &local->sta_bss_list, list) { + if (buf + len - current_ev <= IW_EV_ADDR_LEN) { + spin_unlock_bh(&local->sta_bss_lock); + return -E2BIG; + } + current_ev = ieee80211_sta_scan_result(dev, bss, current_ev, + end_buf); + } + spin_unlock_bh(&local->sta_bss_lock); + return current_ev - buf; +} + + +int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + kfree(ifsta->extra_ie); + if (len == 0) { + ifsta->extra_ie = NULL; + ifsta->extra_ie_len = 0; + return 0; + } + ifsta->extra_ie = kmalloc(len, GFP_KERNEL); + if (!ifsta->extra_ie) { + ifsta->extra_ie_len = 0; + return -ENOMEM; + } + memcpy(ifsta->extra_ie, ie, len); + ifsta->extra_ie_len = len; + return 0; +} + + +struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev, + struct sk_buff *skb, u8 *bssid, + u8 *addr) +{ + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + struct sta_info *sta; + struct ieee80211_sub_if_data *sdata = NULL; + struct net_device *sta_dev = NULL; + + /* TODO: Could consider removing the least recently used entry and + * allow new one to be added. */ + if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) { + if (net_ratelimit()) { + printk(KERN_DEBUG "%s: No room for a new IBSS STA " + "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr)); + } + return NULL; + } + + spin_lock_bh(&local->sub_if_lock); + list_for_each_entry(sdata, &local->sub_if_list, list) + if (sdata->type == IEEE80211_IF_TYPE_IBSS && + memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) { + sta_dev = sdata->dev; + break; + } + spin_unlock_bh(&local->sub_if_lock); + + if (!sta_dev) + return NULL; + + printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n", + dev->name, MAC_ARG(addr), sta_dev->name); + + sta = sta_info_add(local, dev, addr, GFP_ATOMIC); + if (!sta) + return NULL; + + sta->dev = sta_dev; + sta->supp_rates = sdata->u.sta.supp_rates_bits; + + rate_control_rate_init(sta, local); + + return sta; /* caller will call sta_info_put() */ +} + + +int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + + printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n", + dev->name, reason); + + if (sdata->type != IEEE80211_IF_TYPE_STA && + sdata->type != IEEE80211_IF_TYPE_IBSS) + return -EINVAL; + + ieee80211_send_deauth(dev, ifsta, reason); + ieee80211_set_disassoc(dev, ifsta, 1); + return 0; +} + + +int ieee80211_sta_disassociate(struct net_device *dev, u16 reason) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + + printk(KERN_DEBUG "%s: disassociate(reason=%d)\n", + dev->name, reason); + + if (sdata->type != IEEE80211_IF_TYPE_STA) + return -EINVAL; + + if (!ifsta->associated) + return -1; + + ieee80211_send_disassoc(dev, ifsta, reason); + ieee80211_set_disassoc(dev, ifsta, 0); + return 0; +} --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h 2007-03-02 16:02:57.000000000 -0500 @@ -0,0 +1,9 @@ +/* + * mac80211 configuration hooks for cfg80211 + */ +#ifndef __IEEE80211_CFG_H +#define __IEEE80211_CFG_H + +extern struct cfg80211_ops mac80211_config_ops; + +#endif /* __IEEE80211_CFG_H */ jwltest-iwlwifi.patch: Kconfig | 1 Makefile | 1 iwlwifi/Kconfig | 53 iwlwifi/Makefile | 2 iwlwifi/base.c |13165 +++++++++++++++++++++++++++++++++++++++++++++++++++ iwlwifi/iwlwifi.h | 1307 +++++ iwlwifi/iwlwifi_hw.h | 1875 +++++++ 7 files changed, 16404 insertions(+) --- NEW FILE jwltest-iwlwifi.patch --- This corresponds to commit 7b9453dbd92d30bd223acc42d28249b33fa6c61c of iwlwifi. --- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-03-02 16:08:15.000000000 -0500 +++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-03-02 16:08:15.000000000 -0500 @@ -0,0 +1,13165 @@ +/****************************************************************************** + + Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. + + Portions of this file are derived from the ipw3945 project, as well + as portions of the ieee80211 subsystem header files. + + 802.11 status code portion of this file from ethereal-0.10.6: + Copyright 2000, Axis Communications AB + Ethereal - Network traffic analyzer + By Gerald Combs + Copyright 1998 Gerald Combs + + This program is free software; you can redistribute it and/or modify it + under the terms of version 2 of the GNU General Public License as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + + The full GNU General Public License is included in this distribution in the + file called LICENSE. + + Contact Information: + James P. Ketrenos + Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 + +******************************************************************************/ + +/* + * Theory of operation: + * + * The primary NIC mode of operation is configured within the RXON command. + * As such, there are two instances of RXON data -- staging_rxon and + * active_rxon. The former is used to configure the device, the later to + * reflect the actual currently active configuration. + * + * After configuring staging_rxon, it is activated by calling + * ipw_commit_rxon(). The ipw_commit_rxon() will ensure the correct sequence + * of commands are invoked on the hardware to result in Tx being possible + * (if the channel is appropriate for Tx) + * + * About the threading and lock model of the driver... + * + * There are three paths of execution through the driver. + * + * 1. ioctl based (wireless extensions, netdev, etc.) + * 2. interrupt based + * 3. scheduled work queue items + * + * As soon as an interrupt comes in, it schedules a tasklet. That tasklet, + * when run, does any HW checks, pulls any data from the read queue, + * and schedules other layers to do the actual work. + * + * NOTE: This driver is a work in progress. It is currently structured + * in a way that we can add support for the next wireless adapter + * available from Intel. + * + * Our current focus is as follows: + * 1. Get the driver working w/ mac80211 in STA(client) mode. + * 2. Clean up the dual-driver code from function redirection to + * if/else switches where the code detlas are minimal. + * 3. Evaluate the amount of delta between the hardware versions and + * possibly split iwlwifi into multiple drivers for each piece of + * HW, sharing as much base code as possible (would result in + * multiple driver files on disk vs. a single module that works + * with multiple hardware types) + * 4. Document the uCode regulatory enforcement + * 5. Document the rate scaling capabilities of the 3945 + * 6. Provide an initial rate scaling algorithm tailored for the + * statistic data exposed by the 3945. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//#define BIT(x) (1 << (x)) +#include +#include + +//#include +//#include +//#include +#include <../net/mac80211/ieee80211_rate.h> + +#include +#include + +#include "iwlwifi.h" + +#define IWLWIFI_VERSION "0.0.10k" + +#define DRV_DESCRIPTION "Intel(R) Wirless Link driver for Linux" +#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" +#define DRV_VERSION IWLWIFI_VERSION + +MODULE_DESCRIPTION(DRV_DESCRIPTION); +MODULE_VERSION(DRV_VERSION); +MODULE_AUTHOR(DRV_COPYRIGHT); +MODULE_LICENSE("GPL"); + +/*MAC80211 move this to mac80211 files */ +#define IEEE80211_FC(type, stype) cpu_to_le16((type << 2) | (stype << 4)) + +#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010 + +#define IEEE80211_24GHZ_BAND (1<<0) +#define IEEE80211_52GHZ_BAND (1<<1) + +#define IEEE80211_CCK_RATE_1MB 0x02 +#define IEEE80211_CCK_RATE_2MB 0x04 +#define IEEE80211_CCK_RATE_5MB 0x0B +#define IEEE80211_CCK_RATE_11MB 0x16 +#define IEEE80211_OFDM_RATE_6MB 0x0C +#define IEEE80211_OFDM_RATE_9MB 0x12 +#define IEEE80211_OFDM_RATE_12MB 0x18 +#define IEEE80211_OFDM_RATE_18MB 0x24 +#define IEEE80211_OFDM_RATE_24MB 0x30 +#define IEEE80211_OFDM_RATE_36MB 0x48 +#define IEEE80211_OFDM_RATE_48MB 0x60 +#define IEEE80211_OFDM_RATE_54MB 0x6C +#define IEEE80211_BASIC_RATE_MASK 0x80 + +#define IEEE80211_CCK_RATE_1MB_MASK (1<<0) +#define IEEE80211_CCK_RATE_2MB_MASK (1<<1) +#define IEEE80211_CCK_RATE_5MB_MASK (1<<2) +#define IEEE80211_CCK_RATE_11MB_MASK (1<<3) +#define IEEE80211_OFDM_RATE_6MB_MASK (1<<4) +#define IEEE80211_OFDM_RATE_9MB_MASK (1<<5) +#define IEEE80211_OFDM_RATE_12MB_MASK (1<<6) +#define IEEE80211_OFDM_RATE_18MB_MASK (1<<7) +#define IEEE80211_OFDM_RATE_24MB_MASK (1<<8) +#define IEEE80211_OFDM_RATE_36MB_MASK (1<<9) +#define IEEE80211_OFDM_RATE_48MB_MASK (1<<10) +#define IEEE80211_OFDM_RATE_54MB_MASK (1<<11) + +#define IEEE80211_CCK_RATES_MASK 0x0000000F +#define IEEE80211_CCK_BASIC_RATES_MASK (IEEE80211_CCK_RATE_1MB_MASK | \ + IEEE80211_CCK_RATE_2MB_MASK) +#define IEEE80211_CCK_DEFAULT_RATES_MASK (IEEE80211_CCK_BASIC_RATES_MASK | \ + IEEE80211_CCK_RATE_5MB_MASK | \ + IEEE80211_CCK_RATE_11MB_MASK) + +#define IEEE80211_OFDM_RATES_MASK 0x00000FF0 +#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \ + IEEE80211_OFDM_RATE_12MB_MASK | \ + IEEE80211_OFDM_RATE_24MB_MASK) +#define IEEE80211_OFDM_DEFAULT_RATES_MASK (IEEE80211_OFDM_BASIC_RATES_MASK | \ + IEEE80211_OFDM_RATE_9MB_MASK | \ + IEEE80211_OFDM_RATE_18MB_MASK | \ + IEEE80211_OFDM_RATE_36MB_MASK | \ + IEEE80211_OFDM_RATE_48MB_MASK | \ + IEEE80211_OFDM_RATE_54MB_MASK) +#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \ + IEEE80211_CCK_DEFAULT_RATES_MASK) + +#define IEEE80211_NUM_OFDM_RATES 8 +#define IEEE80211_NUM_CCK_RATES 4 +#define IEEE80211_OFDM_SHIFT_MASK_A 4 + +/*MAC80211 end */ + +static u32 ipw_debug_level; + +static int param_debug = 0; +static int param_channel = 0; +static int param_mode = 0; +static int param_auto_create = 1; /* def: create new adhoc network if needed */ +static int param_led = 1; /* def: use LEDs */ +static int param_disable = 0; /* def: enable radio */ +static int param_antenna = 0; /* def: 0 = both antennas (use diversity) */ +static int param_hwcrypto = 0; /* def: using software encryption */ +static int param_qos_enable = 1; + +static const char ipw_modes[] = { + 'a', 'b', 'g', '?' +}; + [...16035 lines suppressed...] + u8 flags; + /* We have 15 LSB to use as we please (MSB indicates + * a frame Rx'd from the HW). We encode the following + * information into the sequence field: + * + * 0:7 index in fifo + * 8:13 fifo selection + * 14:14 bit indicating if this packet references the 'extra' + * storage at the end of the memory queue + * 15:15 (Rx indication) + * + */ + u16 sequence; + + /* command data follows immediately */ + u8 data[0]; +} __attribute__ ((packed)); + +// Used for passing to driver number of successes and failures per rate +struct rate_histogram { + union { + u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; + u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; + u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; + } success; + union { + u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; + u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; + u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; + } failed; +} __attribute__ ((packed)); + +/* statistics command response */ + +struct statistics_rx_phy { + u32 ina_cnt; + u32 fina_cnt; + u32 plcp_err; + u32 crc32_err; + u32 overrun_err; + u32 early_overrun_err; + u32 crc32_good; + u32 false_alarm_cnt; + u32 fina_sync_err_cnt; + u32 sfd_timeout; + u32 fina_timeout; + u32 unresponded_rts; + u32 rxe_frame_limit_overrun; + u32 sent_ack_cnt; + u32 sent_cts_cnt; +} __attribute__ ((packed)); + +struct statistics_rx { + struct statistics_rx_phy ofdm; + struct statistics_rx_phy cck; + u32 bogus_cts; + u32 bogus_ack; + u32 non_bssid_frames; + u32 filtered_frames; + u32 non_channel_beacons; +} __attribute__ ((packed)); + +struct statistics_tx { + u32 preamble_cnt; + u32 rx_detected_cnt; + u32 bt_prio_defer_cnt; + u32 bt_prio_kill_cnt; + u32 few_bytes_cnt; + u32 cts_timeout; + u32 ack_timeout; + u32 expected_ack_cnt; + u32 actual_ack_cnt; +} __attribute__ ((packed)); + +struct statistics_dbg { + u32 burst_check; + u32 burst_count; + u32 reserved[4]; +} __attribute__ ((packed)); + +struct statistics_div { + u32 tx_on_a; + u32 tx_on_b; + u32 exec_time; + u32 probe_time; +} __attribute__ ((packed)); + +struct statistics_general { + u32 temperature; + struct statistics_dbg dbg; + u32 sleep_time; + u32 slots_out; + u32 slots_idle; + u32 ttl_timestamp; + struct statistics_div div; +} __attribute__ ((packed)); + +struct ipw_notif_statistics { + u32 flag; + struct statistics_rx rx; + struct statistics_tx tx; + struct statistics_general general; +} __attribute__ ((packed)); + +struct ipw_rx_packet { + u32 len; + struct ipw_cmd_header hdr; + union { + struct ipw_alive_resp alive_frame; + struct ipw_rx_frame rx_frame; + struct ipw_tx_resp tx_resp; + struct ipw_spectrum_notification spectrum_notif; + struct ipw_csa_notification csa_notif; + struct ipw_error_resp err_resp; + struct ipw_card_state_notif card_state_notif; + struct ipw_notif_statistics stats; + struct BeaconNtfSpecifics beacon_status; + struct ipw_add_sta_resp add_sta; + struct ipw_sleep_notification sleep_notif; + u32 status; + u8 raw[0]; + } u; +} __attribute__ ((packed)); + +#define IPW_RX_FRAME_SIZE (4 + sizeof(struct ipw_rx_frame)) + +struct ipw_multicast_addr { + u8 num_of_multicast_addresses; + u8 reserved[3]; + u8 mac1[6]; + u8 mac2[6]; + u8 mac3[6]; + u8 mac4[6]; +} __attribute__ ((packed)); + +struct ipw_tgi_tx_key { + u8 key_id; + u8 security_type; + u8 station_index; + u8 flags; + u8 key[16]; + u32 tx_counter[2]; +} __attribute__ ((packed)); + +struct ipw_associate { + u8 channel; + u8 auth_type:4, auth_key:4; + u8 assoc_type; + u8 reserved; + u16 policy_support; + u8 preamble_length; + u8 ieee_mode; + u8 bssid[ETH_ALEN]; + u32 assoc_tsf_msw; + u32 assoc_tsf_lsw; + u16 capability; + u16 listen_interval; + u16 beacon_interval; + u8 dest[ETH_ALEN]; + u16 atim_window; + u8 smr; + u8 reserved1; + u16 reserved2; + u16 assoc_id; + u8 erp_value; +} __attribute__ ((packed)); + +#define IPW_SUPPORTED_RATES_IE_LEN 8 + +struct ipw_supported_rates { + u8 ieee_mode; + u8 num_rates; + u8 purpose; + u8 reserved; + u8 supported_rates[IPW_MAX_RATES]; +} __attribute__ ((packed)); + +struct ipw_channel_tx_power { + u8 channel_number; + s8 tx_power; +} __attribute__ ((packed)); + + +#define IPW_RX_BUF_SIZE 3000 + +#endif /* __iwlwifi_hw_h__ */ --- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-03-02 16:07:08.000000000 -0500 +++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile 2007-03-02 16:07:15.000000000 -0500 @@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211) += adm8211/ obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/ obj-$(CONFIG_RTL818X) += rtl818x/ +obj-$(CONFIG_IWLWIFI) += iwlwifi/ --- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-03-02 16:07:08.000000000 -0500 +++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig 2007-03-02 16:07:15.000000000 -0500 @@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad source "drivers/net/wireless/mac80211/p54/Kconfig" source "drivers/net/wireless/mac80211/zd1211rw/Kconfig" source "drivers/net/wireless/mac80211/rtl818x/Kconfig" +source "drivers/net/wireless/mac80211/iwlwifi/Kconfig" Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2961 retrieving revision 1.2961.2.1 diff -u -r1.2961 -r1.2961.2.1 --- kernel-2.6.spec 2 Mar 2007 20:34:02 -0000 1.2961 +++ kernel-2.6.spec 2 Mar 2007 21:23:26 -0000 1.2961.2.1 @@ -29,7 +29,7 @@ %define sublevel 20 %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}.jwltest.3 %define make_target bzImage %define kernel_image x86 @@ -301,7 +301,9 @@ # Patches 10 through 99 are for things that are going upstream really soon. Patch10: linux-2.6-utrace.patch Patch11: nouveau-drm.patch -Patch12: git-wireless-dev.patch +#Patch12: git-wireless-dev.patch +Patch12: jwltest-git-wireless-dev.patch +Patch13: jwltest-iwlwifi.patch # enable sysrq-c on all kernels, not only kexec Patch20: linux-2.6-sysrq-c.patch @@ -858,6 +860,8 @@ # Add the new wireless stack and drivers from wireless-dev %patch12 -p1 +# And the iwlwifi driver from intellinuxwireless.org +%patch13 -p1 # sysrq works always %patch20 -p1 From fedora-cvs-commits at redhat.com Fri Mar 2 21:46:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 16:46:37 -0500 Subject: rpms/mesa/devel mesa-6.5.2-picify-dri-drivers.patch, NONE, 1.1 mesa-6.5.1-build-config.patch, 1.7, 1.8 mesa.spec, 1.125, 1.126 Message-ID: <200703022146.l22LkbQN014343@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/mesa/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14325 Modified Files: mesa-6.5.1-build-config.patch mesa.spec Added Files: mesa-6.5.2-picify-dri-drivers.patch Log Message: * Fri Mar 02 2007 Adam Jackson 6.5.2-7 - mesa-6.5.2-picify-dri-drivers.patch: Attempt to make the DRI drivers PIC. - mesa-6.5.1-build-config.patch: Apply RPM_OPT_FLAGS to OSMesa too. mesa-6.5.2-picify-dri-drivers.patch: mmx_blend.S | 6 +++--- mmx_blendtmp.h | 4 ++-- read_rgba_span_x86.S | 32 ++++++++++++++++---------------- 3 files changed, 21 insertions(+), 21 deletions(-) --- NEW FILE mesa-6.5.2-picify-dri-drivers.patch --- --- Mesa-6.5.2/src/mesa/x86/mmx_blend.S.picify 2006-04-17 14:58:24.000000000 -0400 +++ Mesa-6.5.2/src/mesa/x86/mmx_blend.S 2007-03-02 15:50:07.000000000 -0500 @@ -303,7 +303,7 @@ #define LLTAG(x) LLBL2(x,_min) #define INIT \ - MOVQ ( CONTENT(const_80), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ + MOVQ ( CONTENT(const_80 at GOTOFF(%ebx)), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ #define MAIN( rgba, dest ) \ GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ @@ -327,7 +327,7 @@ #define LLTAG(x) LLBL2(x,_max) #define INIT \ - MOVQ ( CONTENT(const_80), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ + MOVQ ( CONTENT(const_80 at GOTOFF(%ebx)), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ #define MAIN( rgba, dest ) \ GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ @@ -352,7 +352,7 @@ #define INIT \ PXOR ( MM0, MM0 ) /* 0x0000 | 0x0000 | 0x0000 | 0x0000 */ ;\ - MOVQ ( CONTENT(const_0080), MM7 ) /* 0x0080 | 0x0080 | 0x0080 | 0x0080 */ + MOVQ ( CONTENT(const_0080 at GOTOFF(%ebx)), MM7 ) /* 0x0080 | 0x0080 | 0x0080 | 0x0080 */ #define MAIN( rgba, dest ) \ GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ --- Mesa-6.5.2/src/mesa/x86/mmx_blendtmp.h.picify 2005-01-04 09:33:47.000000000 -0500 +++ Mesa-6.5.2/src/mesa/x86/mmx_blendtmp.h 2007-03-02 16:03:46.000000000 -0500 @@ -26,12 +26,12 @@ CMP_L ( CONST(0), ECX) JE ( LLTAG(GMB_return) ) + INIT + MOV_L ( REGOFF(16, EBP), EBX ) /* mask */ MOV_L ( REGOFF(20, EBP), EDI ) /* rgba */ MOV_L ( REGOFF(24, EBP), ESI ) /* dest */ - INIT - TEST_L ( CONST(4), EDI ) /* align rgba on an 8-byte boundary */ JZ ( LLTAG(GMB_align_end) ) --- Mesa-6.5.2/src/mesa/x86/read_rgba_span_x86.S.picify 2006-04-17 14:58:24.000000000 -0400 +++ Mesa-6.5.2/src/mesa/x86/read_rgba_span_x86.S 2007-03-02 15:50:07.000000000 -0500 @@ -84,8 +84,8 @@ #ifdef USE_INNER_EMMS emms #endif - movq mask, %mm1 - movq mask+16, %mm2 + movq mask at GOTOFF(%ebx), %mm1 + movq mask+16 at GOTOFF(%ebx), %mm2 movl 8(%esp), %ebx /* source pointer */ movl 16(%esp), %edx /* number of pixels to copy */ @@ -182,8 +182,8 @@ #ifdef USE_INNER_EMMS emms #endif - movq mask, %mm1 - movq mask+16, %mm2 + movq mask at GOTOFF(%ebx), %mm1 + movq mask+16 at GOTOFF(%ebx), %mm2 movl 16(%esp), %ebx /* source pointer */ movl 24(%esp), %edx /* number of pixels to copy */ @@ -341,8 +341,8 @@ pushl %esi pushl %ebx - movdqa mask, %xmm1 - movdqa mask+16, %xmm2 + movdqa mask at GOTOFF(%ebx), %xmm1 + movdqa mask+16 at GOTOFF(%ebx), %xmm2 movl 12(%esp), %ebx /* source pointer */ movl 20(%esp), %edx /* number of pixels to copy */ @@ -530,9 +530,9 @@ movl 8(%esp), %edx /* destination pointer */ movl 12(%esp), %ecx /* number of pixels to copy */ - movq mask_565, %mm5 - movq prescale, %mm6 - movq scale, %mm7 + movq mask_565 at GOTOFF(%ebx), %mm5 + movq prescale at GOTOFF(%ebx), %mm6 + movq scale at GOTOFF(%ebx), %mm7 sarl $2, %ecx jle .L01 /* Bail early if the count is negative. */ @@ -581,8 +581,8 @@ /* Always set the alpha value to 0xff. */ - por alpha, %mm0 - por alpha, %mm2 + por alpha at GOTOFF(%ebx), %mm0 + por alpha at GOTOFF(%ebx), %mm2 /* Pack the 16-bit values to 8-bit values and store the converted @@ -609,8 +609,8 @@ pmulhuw %mm7, %mm0 pmulhuw %mm7, %mm2 - por alpha, %mm0 - por alpha, %mm2 + por alpha at GOTOFF(%ebx), %mm0 + por alpha at GOTOFF(%ebx), %mm2 packuswb %mm2, %mm0 @@ -647,8 +647,8 @@ pmulhuw %mm7, %mm0 pmulhuw %mm7, %mm2 - por alpha, %mm0 - por alpha, %mm2 + por alpha at GOTOFF(%ebx), %mm0 + por alpha at GOTOFF(%ebx), %mm2 packuswb %mm2, %mm0 @@ -675,7 +675,7 @@ #endif pmulhuw %mm7, %mm0 - por alpha, %mm0 + por alpha at GOTOFF(%ebx), %mm0 packuswb %mm0, %mm0 mesa-6.5.1-build-config.patch: default | 8 ++++---- linux | 4 +++- linux-dri | 13 ++++++------- linux-dri-ppc | 2 +- linux-dri-x86 | 2 +- linux-indirect | 4 ++-- linux-osmesa | 13 +++++++------ linux-osmesa16 | 10 ++++++---- linux-osmesa32 | 10 ++++++---- 9 files changed, 36 insertions(+), 30 deletions(-) Index: mesa-6.5.1-build-config.patch =================================================================== RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.5.1-build-config.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mesa-6.5.1-build-config.patch 3 Dec 2006 23:11:22 -0000 1.7 +++ mesa-6.5.1-build-config.patch 2 Mar 2007 21:46:35 -0000 1.8 @@ -1,6 +1,19 @@ ---- Mesa-6.5.1/configs/linux-osmesa32.build-config 2006-07-12 22:43:20.000000000 -0400 -+++ Mesa-6.5.1/configs/linux-osmesa32 2006-09-22 18:20:05.000000000 -0400 -@@ -17,12 +17,12 @@ +--- Mesa-6.5.2/configs/linux-osmesa32.build-config 2006-07-12 22:43:20.000000000 -0400 ++++ Mesa-6.5.2/configs/linux-osmesa32 2007-03-02 10:22:16.000000000 -0500 +@@ -7,8 +7,10 @@ + # Compiler and flags + CC = gcc + CXX = g++ +-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 +-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE ++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE ++OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math ++CFLAGS = $(OPT_FLAGS) $(DEFINES) -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 ++CXXFLAGS = $(OPT_FLAGS) $(DEFINES) + + + # Library names +@@ -17,12 +19,12 @@ # Directories @@ -15,10 +28,19 @@ +OSMESA_LIB_DEPS = -lm -lpthread -lselinux GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB) APP_LIB_DEPS = -lOSMesa32 ---- Mesa-6.5.1/configs/linux-osmesa.build-config 2006-07-12 22:43:20.000000000 -0400 -+++ Mesa-6.5.1/configs/linux-osmesa 2006-09-22 18:19:52.000000000 -0400 -@@ -14,12 +14,12 @@ - +--- Mesa-6.5.2/configs/linux-osmesa.build-config 2006-07-12 22:43:20.000000000 -0400 ++++ Mesa-6.5.2/configs/linux-osmesa 2007-03-02 10:22:16.000000000 -0500 +@@ -9,17 +9,18 @@ + # Compiler and flags + CC = gcc + CXX = g++ +-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS +-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE +- ++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE ++OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math ++CFLAGS = $(OPT_FLAGS) $(DEFINES) ++CXXFLAGS = $(OPT_FLAGS) $(DEFINES) # Directories -SRC_DIRS = mesa glu @@ -33,9 +55,9 @@ +OSMESA_LIB_DEPS = -lm -lpthread -lselinux GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB) APP_LIB_DEPS = -lOSMesa -lGLU ---- Mesa-6.5.1/configs/default.build-config 2006-09-11 17:35:46.000000000 -0400 -+++ Mesa-6.5.1/configs/default 2006-09-22 18:11:30.000000000 -0400 -@@ -59,8 +59,8 @@ +--- Mesa-6.5.2/configs/default.build-config 2006-10-22 13:20:22.000000000 -0400 ++++ Mesa-6.5.2/configs/default 2007-03-02 10:17:24.000000000 -0500 +@@ -58,8 +58,8 @@ # Directories to build @@ -46,7 +68,7 @@ GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa # Which subdirs under $(TOP)/progs/ to enter: -@@ -73,14 +73,14 @@ +@@ -72,14 +72,14 @@ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm @@ -63,8 +85,8 @@ # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) ---- Mesa-6.5.1/configs/linux-dri-x86.build-config 2005-09-12 11:03:11.000000000 -0400 -+++ Mesa-6.5.1/configs/linux-dri-x86 2006-09-22 18:11:30.000000000 -0400 +--- Mesa-6.5.2/configs/linux-dri-x86.build-config 2005-09-12 11:03:11.000000000 -0400 ++++ Mesa-6.5.2/configs/linux-dri-x86 2007-03-02 10:17:24.000000000 -0500 @@ -6,7 +6,7 @@ CONFIG_NAME = linux-dri-x86 @@ -74,8 +96,8 @@ # Add -m32 to CFLAGS: ARCH_FLAGS = -m32 ---- Mesa-6.5.1/configs/linux-dri.build-config 2006-08-17 10:09:02.000000000 -0400 -+++ Mesa-6.5.1/configs/linux-dri 2006-09-22 18:11:30.000000000 -0400 +--- Mesa-6.5.2/configs/linux-dri.build-config 2006-11-01 19:44:25.000000000 -0500 ++++ Mesa-6.5.2/configs/linux-dri 2007-03-02 10:17:24.000000000 -0500 @@ -12,8 +12,9 @@ #MKDEP = /usr/X11R6/bin/makedepend #MKDEP = gcc -M @@ -87,16 +109,16 @@ PIC_FLAGS = -fPIC # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. -@@ -24,8 +25,6 @@ - -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ - -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN +@@ -25,8 +26,6 @@ + -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ + -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN -X11_INCLUDES = -I/usr/X11R6/include - CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS) -@@ -35,7 +34,7 @@ +@@ -36,7 +35,7 @@ ASM_SOURCES = # Library/program dependencies @@ -105,7 +127,7 @@ LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `pkg-config --libs libdrm` -@@ -52,10 +51,10 @@ +@@ -53,10 +52,10 @@ # Directories ifeq ($(USING_EGL), 1) @@ -118,15 +140,24 @@ PROGRAM_DIRS = endif -@@ -65,4 +64,4 @@ +@@ -66,4 +65,4 @@ # gamma are missing because they have not been converted to use the new # interface. DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \ - savage sis tdfx trident unichrome ffb + savage tdfx trident unichrome ffb # sis ---- Mesa-6.5.1/configs/linux-indirect.build-config 2006-08-17 10:09:02.000000000 -0400 -+++ Mesa-6.5.1/configs/linux-indirect 2006-09-22 18:11:30.000000000 -0400 -@@ -43,7 +43,7 @@ +--- Mesa-6.5.2/configs/linux-indirect.build-config 2006-10-13 09:37:09.000000000 -0400 ++++ Mesa-6.5.2/configs/linux-indirect 2007-03-02 10:22:44.000000000 -0500 +@@ -15,7 +15,7 @@ + #MKDEP_OPTIONS = -MF depend + + WARN_FLAGS = -Wall +-OPT_FLAGS = -O -g ++OPT_FLAGS ?= -O -g + PIC_FLAGS = -fPIC + + # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. +@@ -44,7 +44,7 @@ # Directories @@ -135,8 +166,8 @@ DRIVER_DIRS = PROGRAM_DIRS = WINDOW_SYSTEM=dri ---- Mesa-6.5.1/configs/linux.build-config 2006-08-24 19:37:59.000000000 -0400 -+++ Mesa-6.5.1/configs/linux 2006-09-22 18:11:30.000000000 -0400 +--- Mesa-6.5.2/configs/linux.build-config 2006-09-28 21:23:11.000000000 -0400 ++++ Mesa-6.5.2/configs/linux 2007-03-02 10:17:24.000000000 -0500 @@ -8,7 +8,9 @@ CC = gcc CXX = g++ @@ -148,8 +179,8 @@ PIC_FLAGS = -fPIC # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32 ---- Mesa-6.5.1/configs/linux-dri-ppc.build-config 2005-08-19 18:03:05.000000000 -0400 -+++ Mesa-6.5.1/configs/linux-dri-ppc 2006-09-22 18:11:30.000000000 -0400 +--- Mesa-6.5.2/configs/linux-dri-ppc.build-config 2005-08-19 18:03:05.000000000 -0400 ++++ Mesa-6.5.2/configs/linux-dri-ppc 2007-03-02 10:17:24.000000000 -0500 @@ -5,7 +5,7 @@ CONFIG_NAME = linux-dri-ppc @@ -159,9 +190,22 @@ PIC_FLAGS = -fPIC ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM ---- Mesa-6.5.1/configs/linux-osmesa16.build-config 2006-07-12 22:43:20.000000000 -0400 -+++ Mesa-6.5.1/configs/linux-osmesa16 2006-09-22 18:20:05.000000000 -0400 -@@ -17,12 +17,12 @@ +--- Mesa-6.5.2/configs/linux-osmesa16.build-config 2006-07-12 22:43:20.000000000 -0400 ++++ Mesa-6.5.2/configs/linux-osmesa16 2007-03-02 10:22:16.000000000 -0500 +@@ -7,8 +7,10 @@ + # Compiler and flags + CC = gcc + CXX = g++ +-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 +-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE ++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE ++OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math ++CFLAGS = $(OPT_FLAGS) $(DEFINES) -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 ++CXXFLAGS = $(OPT_FLAGS) $(DEFINES) + + + # Library names +@@ -17,12 +19,12 @@ # Directories Index: mesa.spec =================================================================== RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- mesa.spec 26 Feb 2007 17:20:00 -0000 1.125 +++ mesa.spec 2 Mar 2007 21:46:35 -0000 1.126 @@ -31,7 +31,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 6.5.2 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -47,6 +47,7 @@ Patch18: mesa-6.5.1-selinux-awareness.patch Patch19: mesa-6.5.2-r300-parallel-build.patch Patch20: mesa-6.5.2-libgl-visibility.patch +Patch21: mesa-6.5.2-picify-dri-drivers.patch BuildRequires: pkgconfig %if %{with_dri} @@ -161,6 +162,7 @@ %patch18 -p1 -b .selinux-awareness %patch19 -p1 -b .r300-make-j %patch20 -p1 -b .libgl-visibility +%patch21 -p1 -b .picify # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT # license and are not open source/free software, so we remove them. @@ -171,7 +173,7 @@ # The i965 DRI driver breaks if compiled with -O2. It appears to be # an aliasing problem, so we add -fno-strict-aliasing to the flags. -export OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fvisibility=hidden" +export OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fvisibility=hidden -fPIC" export DRI_DRIVER_DIR="%{_libdir}/dri" export LIB_DIR=%{_lib} @@ -330,6 +332,10 @@ %{_bindir}/glxinfo %changelog +* Fri Mar 02 2007 Adam Jackson 6.5.2-7 +- mesa-6.5.2-picify-dri-drivers.patch: Attempt to make the DRI drivers PIC. +- mesa-6.5.1-build-config.patch: Apply RPM_OPT_FLAGS to OSMesa too. + * Mon Feb 26 2007 Adam Jackson 6.5.2-6 - mesa-6.5.2-libgl-visibility.patch: Fix non-exported GLX symbols (#229808) - Require a sufficiently new libdrm at runtime too From fedora-cvs-commits at redhat.com Fri Mar 2 21:51:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 16:51:53 -0500 Subject: rpms/pirut/devel .cvsignore, 1.53, 1.54 pirut.spec, 1.55, 1.56 sources, 1.54, 1.55 Message-ID: <200703022151.l22LprCE007564@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pirut/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7537/devel Modified Files: .cvsignore pirut.spec sources Log Message: auto-import pirut-1.3.3-1 on branch devel from pirut-1.3.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 21 Feb 2007 21:34:20 -0000 1.53 +++ .cvsignore 2 Mar 2007 21:51:51 -0000 1.54 @@ -1 +1 @@ -pirut-1.3.2.tar.gz +pirut-1.3.3.tar.gz Index: pirut.spec =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- pirut.spec 21 Feb 2007 21:34:20 -0000 1.55 +++ pirut.spec 2 Mar 2007 21:51:51 -0000 1.56 @@ -2,7 +2,7 @@ Summary: Package Installation, Removal and Update Tools Name: pirut -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} License: GPL Group: Applications/System @@ -76,6 +76,11 @@ %{_mandir}/man8/system-install-packages.8* %changelog +* Fri Mar 2 2007 Jeremy Katz - 1.3.3-1 +- Support installing a single package from a repo by passing a + package name to system-install-packages (Owen Taylor) +- Don't force downloading of headers + * Wed Feb 21 2007 Jeremy Katz - 1.3.1-1 - Actually include CD support python file - Add xen to rebootpkgs Index: sources =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 21 Feb 2007 21:34:20 -0000 1.54 +++ sources 2 Mar 2007 21:51:51 -0000 1.55 @@ -1 +1 @@ -15772fabf10f1b5fc052355ee3709017 pirut-1.3.2.tar.gz +58e3e37e8492133ad2495ef0f3c73815 pirut-1.3.3.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 2 22:26:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 17:26:38 -0500 Subject: rpms/audit/devel audit.spec,1.129,1.130 sources,1.88,1.89 Message-ID: <200703022226.l22MQcK6001819@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1804 Modified Files: audit.spec sources Log Message: * Fri Mar 2 2007 Steve Grubb 1.5-1 - NEW audit dispatcher program & plugin framework - Correct hidden variables in libauparse - Added NISPOM sample rules - Verify accessibility of files passed in auparse_init - Fix bug in parser library interpreting socketcalls - Add support for stdio FILE pointer in auparse_init - Adjust init script to allow anyone to status auditd (#230626) Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- audit.spec 21 Feb 2007 02:49:15 -0000 1.129 +++ audit.spec 2 Mar 2007 22:26:36 -0000 1.130 @@ -52,6 +52,14 @@ The audit-libs-python package contains the bindings so that libaudit and libauparse can be used by python. +%package audispd-plugins +Summary: Default plugins for the audit dispatcher +License: LGPL +Group: System Environment/Daemons + +%description audispd-plugins +The audispd-plugins package contains plugins for the audit dispatcher. + %prep %setup -q @@ -153,31 +161,44 @@ %{_libdir}/python?.?/site-packages/_auparse.so /usr/lib/python?.?/site-packages/audit.py* /usr/lib/python?.?/site-packages/auparse.py* -/usr/lib/python?.?/site-packages/AuditMsg.py* + +%files audispd-plugins +%defattr(-,root,root) +%{_libexecdir}/* %files %defattr(-,root,root,-) -%doc README COPYING ChangeLog sample.rules contrib/capp.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron audisp/README-CONF_D audisp/README-PLUGINS_D +%doc README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron %attr(0644,root,root) %{_mandir}/man8/* +%attr(0644,root,root) %{_mandir}/man5/* %attr(750,root,root) /sbin/auditctl %attr(750,root,root) /sbin/auditd %attr(755,root,root) /sbin/ausearch %attr(755,root,root) /sbin/aureport %attr(750,root,root) /sbin/autrace -%attr(750,root,root) %{_libexecdir}/* %attr(755,root,root) /etc/rc.d/init.d/auditd %attr(750,root,root) %{_var}/log/audit %attr(750,root,root) %dir /etc/audit -%attr(750,root,root) %dir /etc/audisp.d +%attr(750,root,root) %dir /etc/audispd +%attr(750,root,root) %dir /etc/audispd/plugins.d +%attr(750,root,root) %dir /etc/audispd/policies.d %attr(750,root,root) %dir %{_libdir}/audit %config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd -%config(noreplace) %attr(640,root,root) /etc/audispd.conf +%config(noreplace) %attr(640,root,root) /etc/audispd/audispd.conf +%doc %attr(640,root,root) /etc/audispd/plugins.d/README-CONF_PLUGINS_D +%doc %attr(640,root,root) /etc/audispd/policies.d/README-CONF_POLICIES_D %changelog -* Tue Feb 20 2007 Steve Grubb 1.5-1 +* Fri Mar 2 2007 Steve Grubb 1.5-1 - NEW audit dispatcher program & plugin framework +- Correct hidden variables in libauparse +- Added NISPOM sample rules +- Verify accessibility of files passed in auparse_init +- Fix bug in parser library interpreting socketcalls +- Add support for stdio FILE pointer in auparse_init +- Adjust init script to allow anyone to status auditd (#230626) * Tue Feb 20 2007 Steve Grubb 1.4.2-1 - Add man pages Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- sources 21 Feb 2007 02:43:37 -0000 1.88 +++ sources 2 Mar 2007 22:26:36 -0000 1.89 @@ -1 +1 @@ -6dd91881ebb4f9d4a1fa74002347d917 audit-1.5.tar.gz +a83ccf6400265c0427f003dcb427134b audit-1.5.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 2 23:40:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 18:40:41 -0500 Subject: rpms/audit/devel audit.spec,1.130,1.131 sources,1.89,1.90 Message-ID: <200703022340.l22NefUX010989@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10974 Modified Files: audit.spec sources Log Message: * Fri Mar 2 2007 Steve Grubb 1.5-2 - rebuild Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- audit.spec 2 Mar 2007 22:26:36 -0000 1.130 +++ audit.spec 2 Mar 2007 23:40:38 -0000 1.131 @@ -1,7 +1,7 @@ Summary: User space tools for 2.6 kernel auditing Name: audit Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ @@ -191,6 +191,9 @@ %doc %attr(640,root,root) /etc/audispd/policies.d/README-CONF_POLICIES_D %changelog +* Fri Mar 2 2007 Steve Grubb 1.5-2 +- rebuild + * Fri Mar 2 2007 Steve Grubb 1.5-1 - NEW audit dispatcher program & plugin framework - Correct hidden variables in libauparse Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- sources 2 Mar 2007 22:26:36 -0000 1.89 +++ sources 2 Mar 2007 23:40:38 -0000 1.90 @@ -1 +1 @@ -a83ccf6400265c0427f003dcb427134b audit-1.5.tar.gz +81d2c5d76c6130c1f95cb1cdb9032523 audit-1.5.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 2 23:52:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 18:52:07 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2961, 1.2962 upstream, 1.469, 1.470 Message-ID: <200703022352.l22Nq7FN004371@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4348 Modified Files: kernel-2.6.spec upstream Log Message: * Fri Mar 02 2007 Dave Jones - 2.6.21rc2-git2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2961 retrieving revision 1.2962 diff -u -r1.2961 -r1.2962 --- kernel-2.6.spec 2 Mar 2007 20:34:02 -0000 1.2961 +++ kernel-2.6.spec 2 Mar 2007 23:52:05 -0000 1.2962 @@ -295,7 +295,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.21-rc2.bz2 -Patch2: patch-2.6.21-rc2-git1.bz2 +Patch2: patch-2.6.21-rc2-git2.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -2037,6 +2037,9 @@ %changelog * Fri Mar 02 2007 Dave Jones +- 2.6.21rc2-git2 + +* Fri Mar 02 2007 Dave Jones - Enable PM_TRACE * Thu Mar 1 2007 John W. Linville Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.469 retrieving revision 1.470 diff -u -r1.469 -r1.470 --- upstream 1 Mar 2007 07:16:34 -0000 1.469 +++ upstream 2 Mar 2007 23:52:05 -0000 1.470 @@ -1,3 +1,3 @@ linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git1.bz2 +patch-2.6.21-rc2-git2.bz2 From fedora-cvs-commits at redhat.com Fri Mar 2 23:52:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 18:52:07 -0500 Subject: rpms/kernel/devel/configs config-generic,1.297,1.298 Message-ID: <200703022352.l22Nq7c0004379@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv4348/configs Modified Files: config-generic Log Message: * Fri Mar 02 2007 Dave Jones - 2.6.21rc2-git2 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- config-generic 2 Mar 2007 20:34:02 -0000 1.297 +++ config-generic 2 Mar 2007 23:52:05 -0000 1.298 @@ -1449,6 +1449,7 @@ # CAPI subsystem # CONFIG_ISDN_CAPI=m +# CONFIG_CAPI_TRACE is not set CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m From fedora-cvs-commits at redhat.com Fri Mar 2 23:53:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 18:53:21 -0500 Subject: rpms/kernel/devel patch-2.6.21-rc2-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.577, 1.578 sources, 1.540, 1.541 patch-2.6.21-rc2-git1.bz2.sign, 1.1, NONE Message-ID: <200703022353.l22NrLr7004418@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4403 Modified Files: .cvsignore sources Added Files: patch-2.6.21-rc2-git2.bz2.sign Removed Files: patch-2.6.21-rc2-git1.bz2.sign Log Message: * Fri Mar 02 2007 Dave Jones - 2.6.21rc2-git2 --- NEW FILE patch-2.6.21-rc2-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF5/ZZyGugalF9Dw4RAigHAJ47bxAeOtI0V4jvNRjpFl7T5Bn0IACfZDF4 w5Ypa1wwAhmNGBRVgfOyhKw= =jeIr -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.577 retrieving revision 1.578 diff -u -r1.577 -r1.578 --- .cvsignore 1 Mar 2007 07:16:34 -0000 1.577 +++ .cvsignore 2 Mar 2007 23:53:19 -0000 1.578 @@ -4,4 +4,4 @@ kernel-2.6.20 linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git1.bz2 +patch-2.6.21-rc2-git2.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.540 retrieving revision 1.541 diff -u -r1.540 -r1.541 --- sources 1 Mar 2007 07:16:34 -0000 1.540 +++ sources 2 Mar 2007 23:53:19 -0000 1.541 @@ -1,3 +1,3 @@ 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 e31c877d30a840c590c06e53779246f4 patch-2.6.21-rc2.bz2 -b42f45a5beebc521cac22cba7f70b206 patch-2.6.21-rc2-git1.bz2 +639c61af04502661387c806bfac249d0 patch-2.6.21-rc2-git2.bz2 --- patch-2.6.21-rc2-git1.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Sat Mar 3 02:39:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 2 Mar 2007 21:39:44 -0500 Subject: rpms/eclipse/devel eclipse-ecj-gcj.patch, 1.3, 1.4 eclipse.spec, 1.411, 1.412 Message-ID: <200703030239.l232diTx012744@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12602 Modified Files: eclipse-ecj-gcj.patch eclipse.spec Log Message: * Fri Mar 02 2007 Ben Konrath 3.2.2-3 - Uncomment 'this.generatePackagesStructure = true;' in ecj-gcj patch. eclipse-ecj-gcj.patch: GCCMain.java | 495 ++++++++++++++++++++++++++++++++++++++++++++++++++++ messages.properties | 5 2 files changed, 500 insertions(+) Index: eclipse-ecj-gcj.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ecj-gcj.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-ecj-gcj.patch 26 Feb 2007 18:40:51 -0000 1.3 +++ eclipse-ecj-gcj.patch 3 Mar 2007 02:39:41 -0000 1.4 @@ -367,7 +367,7 @@ + this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$ + } + this.destinationPath = arg; -+ // this.generatePackagesStructure = true; ++ this.generatePackagesStructure = true; + } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$ + classpath = getArgument(currentArg); + } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$ Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.411 retrieving revision 1.412 diff -u -r1.411 -r1.412 --- eclipse.spec 26 Feb 2007 18:40:52 -0000 1.411 +++ eclipse.spec 3 Mar 2007 02:39:41 -0000 1.412 @@ -19,7 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 2%{?dist} +Release: 3%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1739,6 +1739,9 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Fri Mar 02 2007 Ben Konrath 3.2.2-3 +- Uncomment 'this.generatePackagesStructure = true;' in ecj-gcj patch. + * Mon Feb 26 2007 Ben Konrath 3.2.2-2 - Add gcc messages to ecj-gcj patch. From fedora-cvs-commits at redhat.com Sat Mar 3 13:29:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 3 Mar 2007 08:29:49 -0500 Subject: rpms/compat-gcc-34/devel gcc34-CVE-2006-3619.patch, NONE, 1.1 gcc34-CXXABI131.patch, NONE, 1.1 gcc34-dwarf2-inline-details-fix.patch, NONE, 1.1 gcc34-java-zoneinfo.patch, NONE, 1.1 gcc34-libgcc-additions.patch, NONE, 1.1 gcc34-rh205919.patch, NONE, 1.1 gcc34-rh207277.patch, NONE, 1.1 gcc34-var-tracking-coalesce.patch, NONE, 1.1 compat-gcc-34.spec, 1.5, 1.6 Message-ID: <200703031329.l23DTnEM015734@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/compat-gcc-34/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15676 Modified Files: compat-gcc-34.spec Added Files: gcc34-CVE-2006-3619.patch gcc34-CXXABI131.patch gcc34-dwarf2-inline-details-fix.patch gcc34-java-zoneinfo.patch gcc34-libgcc-additions.patch gcc34-rh205919.patch gcc34-rh207277.patch gcc34-var-tracking-coalesce.patch Log Message: 3.4.6-7 gcc34-CVE-2006-3619.patch: jartool.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletion(-) --- NEW FILE gcc34-CVE-2006-3619.patch --- 2006-07-17 Richard Guenther * jartool.c (extract_jar): Do not allow directory traversal to parents of the extraction root. --- fastjar/jartool.c.jj 2006-07-11 10:53:39.000000000 +0200 +++ fastjar/jartool.c 2006-07-18 13:49:39.000000000 +0200 @@ -1736,6 +1736,7 @@ int extract_jar(int fd, char **files, in const ub1 *start = filename; char *tmp_buff; struct stat sbuf; + int depth = 0; tmp_buff = malloc(sizeof(char) * strlen((const char *)filename)); @@ -1756,7 +1757,14 @@ int extract_jar(int fd, char **files, in #ifdef DEBUG printf("checking the existance of %s\n", tmp_buff); #endif - + if(strcmp(tmp_buff, "..") == 0){ + --depth; + if (depth < 0){ + fprintf(stderr, "Traversal to parent directories during unpacking!\n"); + exit(1); + } + } else if (strcmp(tmp_buff, ".") != 0) + ++depth; if(stat(tmp_buff, &sbuf) < 0){ if(errno != ENOENT){ perror("stat"); gcc34-CXXABI131.patch: 0 files changed --- NEW FILE gcc34-CXXABI131.patch --- 2005-02-18 Richard Henderson PR libstdc++/10606 * config/linker-map.gnu (CXXABI_1.3.1): Add __cxa_get_exception_ptr. * libsupc++/eh_catch.cc (__cxa_get_exception_ptr): New. * libsupc++/unwind-cxx.h (__cxa_get_exception_ptr): Declare. --- libstdc++-v3/config/linker-map.gnu (revision 94498) +++ libstdc++-v3/config/linker-map.gnu (revision 95705) @@ -406,3 +410,9 @@ CXXABI_1.3 { local: *; }; + +CXXABI_1.3.1 { + + __cxa_get_exception_ptr; + +} CXXABI_1.3; --- libstdc++-v3/libsupc++/unwind-cxx.h (revision 94498) +++ libstdc++-v3/libsupc++/unwind-cxx.h (revision 95705) @@ -107,6 +107,7 @@ extern "C" void __cxa_throw (void *throw __attribute__((noreturn)); // Used to implement exception handlers. +extern "C" void *__cxa_get_exception_ptr (void *) throw(); extern "C" void *__cxa_begin_catch (void *) throw(); extern "C" void __cxa_end_catch (); extern "C" void __cxa_rethrow () __attribute__((noreturn)); --- libstdc++-v3/libsupc++/eh_catch.cc (revision 94498) +++ libstdc++-v3/libsupc++/eh_catch.cc (revision 95705) @@ -33,6 +33,15 @@ using namespace __cxxabiv1; +extern "C" void * +__cxxabiv1::__cxa_get_exception_ptr(void *exc_obj_in) throw() +{ + _Unwind_Exception *exceptionObject + = reinterpret_cast <_Unwind_Exception *>(exc_obj_in); + __cxa_exception *header = __get_exception_header_from_ue (exceptionObject); + + return header->adjustedPtr; +} extern "C" void * __cxxabiv1::__cxa_begin_catch (void *exc_obj_in) throw() gcc34-dwarf2-inline-details-fix.patch: tree-inline.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE gcc34-dwarf2-inline-details-fix.patch --- 2006-11-07 Alexandre Oliva * tree-inline.c (expand_call_inline): Set BLOCK_SOURCE_LOCATION. --- gcc/tree-inline.c.orig 2006-10-13 04:31:24.000000000 -0300 +++ gcc/tree-inline.c 2006-11-07 04:06:10.000000000 -0200 @@ -1253,6 +1253,7 @@ expand_call_inline (tree *tp, int *walk_ tree args; tree return_slot_addr; const char *reason; + location_t incoming_loc = input_location; /* See what we've got. */ id = (inline_data *) data; @@ -1464,7 +1465,10 @@ expand_call_inline (tree *tp, int *walk_ /* Tell the debugging backends that this block represents the outermost scope of the inlined function. */ if (SCOPE_STMT_BLOCK (scope_stmt)) - BLOCK_ABSTRACT_ORIGIN (SCOPE_STMT_BLOCK (scope_stmt)) = DECL_ORIGIN (fn); + { + BLOCK_ABSTRACT_ORIGIN (SCOPE_STMT_BLOCK (scope_stmt)) = DECL_ORIGIN (fn); + BLOCK_SOURCE_LOCATION (SCOPE_STMT_BLOCK (scope_stmt)) = incoming_loc; + } /* Declare the return variable for the function. */ COMPOUND_BODY (stmt) gcc34-java-zoneinfo.patch: Makefile.am | 1 Makefile.in | 2 gnu/java/util/ZoneInfo.java | 1160 +++++++++++++++++++++++++++++++++++++++ java/lang/System.java | 1 java/util/Date.java | 9 java/util/GregorianCalendar.java | 20 java/util/SimpleTimeZone.java | 18 java/util/TimeZone.java | 1119 ++++++++++++++++++++++++++++++------- java/util/natTimeZone.cc | 10 posix.cc | 4 10 files changed, 2129 insertions(+), 215 deletions(-) --- NEW FILE gcc34-java-zoneinfo.patch --- 2007-02-24 Jakub Jelinek * java/util/TimeZone.java (getDefaultDisplayName): Don't check if TimeZone is instanceof SimpleTimeZone. 2007-02-23 Jakub Jelinek PR libgcj/17002 PR classpath/28550 * java/lang/System.java: Add gnu.java.util.zoneinfo.dir to comments. * posix.cc (_Jv_platform_initProperties): Set gnu.java.util.zoneinfo.dir. * Makefile.am (ordinary_java_source_files): Add gnu/java/util/ZoneInfo.java. * Makefile.in: Regenerated. * java/util/Date.java (parse): Properly parse 09:01:02 as hours/minutes/seconds, not as hours/minutes/year. * java/util/SimpleTimeZone.java (getOffset): Handle properly millis + dstOffset overflowing into the next day. * java/util/TimeZone.java (zoneinfo_dir, availableIDs, aliases0): New static fields. (timezones): Remove synchronized keyword. Set zoneinfo_dir. If non-null, set up aliases0 and don't put anything into timezones0. (defaultZone): Call getTZEnvVar to try TZ env var. Try to read /etc/localtime using ZoneInfo.readTZFile. Call getDefaultTimeZone instead of getTimeZone. (getDefaultTimeZone, getDateParams, parseTime): New private methods. (getTimeZoneInternal): New private method. (getTimeZone): Do the custom ID checking first, canonicalize ID for custom IDs as required by documentation. Call getTimeZoneInternal to handle the rest. (getAvailableIDs(int)): Add locking. Handle zoneinfo_dir != null. (getAvailableIDs(File,String,ArrayList)): New private method. (getAvailableIDs()): Add locking. Handle zoneinfo_dir != null. (readSysconfigClockFile): New static method. (getTZEnvVar): New native method. * java/util/natTimeZone.cc: Include stdlib.h. (getTZEnvVar): New method. * gnu/java/util/ZoneInfo.java: New file. * java/util/GregorianCalendar.java (GregorianCalendar): Call clear before set in the constructors that don't initialize it to current time. 2007-02-09 Jakub Jelinek PR 23566 * java/util/TimeZone.java (timezones): Regenerate from tzdata2007a. 2005-02-21 Jeroen Frijters * java/util/GregorianCalendar.java (GregorianCalendar): Chained constructors to a (new) common constructor. --- libjava/Makefile.am.jj 2006-10-05 00:38:22.000000000 +0200 +++ libjava/Makefile.am 2007-02-23 13:44:59.000000000 +0100 @@ -2382,6 +2382,7 @@ gnu/java/text/SentenceBreakIterator.java gnu/java/text/WordBreakIterator.java \ gnu/java/util/DoubleEnumeration.java \ gnu/java/util/EmptyEnumeration.java \ +gnu/java/util/ZoneInfo.java \ gnu/java/util/prefs/MemoryBasedFactory.java \ gnu/java/util/prefs/NodeReader.java \ gnu/java/util/prefs/MemoryBasedPreferences.java \ --- libjava/Makefile.in.jj 2006-10-05 00:38:22.000000000 +0200 +++ libjava/Makefile.in 2007-02-23 13:46:07.000000000 +0100 @@ -2073,6 +2073,7 @@ gnu/java/text/SentenceBreakIterator.java gnu/java/text/WordBreakIterator.java \ gnu/java/util/DoubleEnumeration.java \ gnu/java/util/EmptyEnumeration.java \ +gnu/java/util/ZoneInfo.java \ gnu/java/util/prefs/MemoryBasedFactory.java \ gnu/java/util/prefs/NodeReader.java \ gnu/java/util/prefs/MemoryBasedPreferences.java \ @@ -3331,6 +3332,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_D .deps/gnu/java/text/WordBreakIterator.P \ .deps/gnu/java/util/DoubleEnumeration.P \ .deps/gnu/java/util/EmptyEnumeration.P \ +.deps/gnu/java/util/ZoneInfo.P \ .deps/gnu/java/util/prefs/FileBasedFactory.P \ .deps/gnu/java/util/prefs/MemoryBasedFactory.P \ .deps/gnu/java/util/prefs/MemoryBasedPreferences.P \ --- libjava/java/util/GregorianCalendar.java.jj 2006-10-05 00:38:18.000000000 +0200 +++ libjava/java/util/GregorianCalendar.java 2007-02-23 19:30:20.000000000 +0100 @@ -121,6 +121,13 @@ public class GregorianCalendar extends C this(TimeZone.getDefault(), locale); } + private GregorianCalendar(TimeZone zone, Locale locale, boolean unused) + { + super(zone, locale); + ResourceBundle rb = getBundle(locale); + gregorianCutover = ((Date) rb.getObject("gregorianCutOver")).getTime(); + } + /** * Constructs a new GregorianCalender representing the current * time with the given time zone and the given locale. @@ -129,9 +136,7 @@ public class GregorianCalendar extends C */ public GregorianCalendar(TimeZone zone, Locale locale) { - super(zone, locale); - ResourceBundle rb = getBundle(locale); - gregorianCutover = ((Date) rb.getObject("gregorianCutOver")).getTime(); + this(zone, locale, false); setTimeInMillis(System.currentTimeMillis()); } @@ -144,7 +149,8 @@ public class GregorianCalendar extends C */ public GregorianCalendar(int year, int month, int day) { - super(); + this(TimeZone.getDefault(), Locale.getDefault(), false); + clear(); set(year, month, day); } @@ -159,7 +165,8 @@ public class GregorianCalendar extends C */ public GregorianCalendar(int year, int month, int day, int hour, int minute) { - super(); + this(TimeZone.getDefault(), Locale.getDefault(), false); + clear(); set(year, month, day, hour, minute); } @@ -176,7 +183,8 @@ public class GregorianCalendar extends C public GregorianCalendar(int year, int month, int day, int hour, int minute, int second) { - super(); + this(TimeZone.getDefault(), Locale.getDefault(), false); + clear(); set(year, month, day, hour, minute, second); } --- libjava/java/util/SimpleTimeZone.java.jj 2006-10-05 00:38:18.000000000 +0200 +++ libjava/java/util/SimpleTimeZone.java 2007-02-23 14:38:01.000000000 +0100 @@ -460,16 +460,34 @@ public class SimpleTimeZone extends Time int daylightSavings = 0; if (useDaylight && era == GregorianCalendar.AD && year >= startYear) { + int orig_year = year; // This does only work for Gregorian calendars :-( // This is mainly because setStartYear doesn't take an era. boolean afterStart = !isBefore(year, month, day, dayOfWeek, millis, startMode, startMonth, startDay, startDayOfWeek, startTime); + millis += dstSavings; + if (millis >= 24 * 60 * 60 * 1000) + { + millis -= 24 * 60 * 60 * 1000; + dayOfWeek = (dayOfWeek % 7) + 1; + if (++day > getDaysInMonth(month, year)) + { + day = 1; + if (month++ == Calendar.DECEMBER) + { + month = Calendar.JANUARY; + year++; + } + } + } boolean beforeEnd = isBefore(year, month, day, dayOfWeek, millis, endMode, endMonth, endDay, endDayOfWeek, endTime); + if (orig_year != year) + afterStart = false; if (startMonth < endMonth) { // use daylight savings, if the date is after the start of --- libjava/java/util/Date.java.jj 2006-10-05 00:38:18.000000000 +0200 +++ libjava/java/util/Date.java 2007-02-23 14:38:01.000000000 +0100 @@ -411,6 +411,7 @@ public class Date implements Cloneable, } else if (firstch >= '0' && firstch <= '9') { + int lastPunct = -1; while (tok != null && tok.length() > 0) { int punctOffset = tok.length(); @@ -448,6 +449,13 @@ public class Date implements Cloneable, else minute = num; } + else if (lastPunct == ':' && hour >= 0 && (minute < 0 || second < 0)) + { + if (minute < 0) + minute = num; + else + second = num; + } else if ((num >= 70 [...2625 lines suppressed...] + else + { // convert the dst string to a millis number + String offset = tzstr.substring(prevIndex, index); + prevIndex = index; + + if (offset.charAt(0) == '+' || offset.charAt(0) == '-') + dstOffs = parseTime(offset.substring(1)); + else + dstOffs = parseTime(offset); + + if (offset.charAt(0) == '-') + dstOffs = -dstOffs; + + // TZ timezone offsets are positive when WEST of the meridian. + dstOffs = -dstOffs; + } + + // Done yet? (Format: std offset dst offset) + if (index >= idLength) + return new SimpleTimeZone(stdOffs, stdName); + + // get the DST rule + if (tzstr.charAt(index) == ',' + || tzstr.charAt(index) == ';') + { + index++; + int offs = index; + while (tzstr.charAt(index) != ',' + && tzstr.charAt(index) != ';') + index++; + String startTime = tzstr.substring(offs, index); + index++; + String endTime = tzstr.substring(index); + + index = startTime.indexOf('/'); + int startMillis; + int endMillis; + String startDate; + String endDate; + if (index != -1) + { + startDate = startTime.substring(0, index); + startMillis = parseTime(startTime.substring(index + 1)); + } + else + { + startDate = startTime; + // if time isn't given, default to 2:00:00 AM. + startMillis = 2 * 60 * 60 * 1000; + } + index = endTime.indexOf('/'); + if (index != -1) + { + endDate = endTime.substring(0, index); + endMillis = parseTime(endTime.substring(index + 1)); + } + else + { + endDate = endTime; + // if time isn't given, default to 2:00:00 AM. + endMillis = 2 * 60 * 60 * 1000; + } + + int[] start = getDateParams(startDate); + int[] end = getDateParams(endDate); + return new SimpleTimeZone(stdOffs, tzstr, start[0], start[1], + start[2], startMillis, end[0], end[1], + end[2], endMillis, (dstOffs - stdOffs)); + } + } + + catch (IndexOutOfBoundsException _) + { + } + catch (NumberFormatException _) + { + } + + return null; + } + + /** + * Parses and returns the params for a POSIX TZ date field, + * in the format int[]{ month, day, dayOfWeek }, following the + * SimpleTimeZone constructor rules. + */ + private static int[] getDateParams(String date) + { + int[] dayCount = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; + int month; + int type = 0; + + if (date.charAt(0) == 'M' || date.charAt(0) == 'm') + type = 1; + else if (date.charAt(0) == 'A' || date.charAt(0) == 'a') + type = 2; + + if (type > 0) + { + int day; + + // Month, week of month, day of week + // "Mm.w.d". d is between 0 (Sunday) and 6. Week w is + // between 1 and 5; Week 1 is the first week in which day d + // occurs and Week 5 specifies the last d day in the month. + // Month m is between 1 and 12. + + // Month, day of month, day of week + // ZoneInfo extension, not in POSIX + // "Am.n.d". d is between 0 (Sunday) and 6. Day of month n is + // between 1 and 25. Month m is between 1 and 12. + + month = Integer.parseInt(date.substring(1, date.indexOf('.'))); + int week = Integer.parseInt(date.substring(date.indexOf('.') + 1, + date.lastIndexOf('.'))); + int dayOfWeek = Integer.parseInt(date.substring(date.lastIndexOf('.') + + 1)); + dayOfWeek++; // Java day of week is one-based, Sunday is first day. + + if (type == 2) + { + day = week; + dayOfWeek = -dayOfWeek; + } + else if (week == 5) + day = -1; // last day of month is -1 in java, 5 in TZ + else + { + // First day of week starting on or after. For example, + // to specify the second Sunday of April, set month to + // APRIL, day-of-month to 8, and day-of-week to -SUNDAY. + day = (week - 1) * 7 + 1; + dayOfWeek = -dayOfWeek; + } + + month--; // Java month is zero-based. + return new int[] { month, day, dayOfWeek }; + } + + // julian day, either zero-based 0<=n<=365 (incl feb 29) + // or one-based 1<=n<=365 (no feb 29) + int julianDay; // Julian day + + if (date.charAt(0) != 'J' || date.charAt(0) != 'j') + { + julianDay = Integer.parseInt(date.substring(1)); + julianDay++; // make 1-based + // Adjust day count to include feb 29. + dayCount = new int[] + { + 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 + }; + } + else + // 1-based julian day + julianDay = Integer.parseInt(date); + + int i = 11; + while (i > 0) + if (dayCount[i] < julianDay) + break; + else + i--; + julianDay -= dayCount[i]; + month = i; + return new int[] { month, julianDay, 0 }; + } + + /** + * Parses a time field hh[:mm[:ss]], returning the result + * in milliseconds. No leading sign. + */ + private static int parseTime(String time) + { + int millis = 0; + int i = 0; + + while (i < time.length()) + if (time.charAt(i) == ':') + break; + else + i++; + millis = 60 * 60 * 1000 * Integer.parseInt(time.substring(0, i)); + if (i >= time.length()) + return millis; + + int iprev = ++i; + while (i < time.length()) + if (time.charAt(i) == ':') + break; + else + i++; + millis += 60 * 1000 * Integer.parseInt(time.substring(iprev, i)); + if (i >= time.length()) + return millis; + + millis += 1000 * Integer.parseInt(time.substring(++i)); + return millis; + } +} gcc34-libgcc-additions.patch: libgcc-std.ver | 34 +++++ libgcc2.c | 334 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ libgcc2.h | 28 ++++ mklibgcc.in | 4 4 files changed, 398 insertions(+), 2 deletions(-) --- NEW FILE gcc34-libgcc-additions.patch --- 2007-01-05 Jakub Jelinek PR c/30360 * libgcc2.c (__divdc3): Compare c and d against 0.0 instead of denom against 0.0. 2005-11-22 Joseph S. Myers * libgcc-std.ver (GCC_4.2.0): New version. * libgcc2.c (__floatundixf, __floatunditf, __floatundidf, __floatundisf): New functions. * libgcc2.h (__floatundixf, __floatunditf, __floatundidf, __floatundisf): Declare. * mklibgcc.in (lib2funcs): Add _floatundidf, _floatundisf, _floatundixf, and _floatunditf. 2005-03-30 Fariborz Jahanian * libgcc2.h (__powisf2, __powidf2, __powixf2, __powitf2): Change 2nd argument type to int. * libgcc2.c: Change prototype of __powi* functions to use int. 2005-02-11 Richard Henderson * libgcc2.c (__divsc3, __divdc3, __divxc3, __divtc3, __mulsc3, __muldc3, __mulxc3, __multc3): New. * libgcc2.h: Declare them. * libgcc-std.ver: Export them. * mklibgcc.in (lib2funcs): Build them. 2005-02-09 Richard Guenther PR middle-end/19402 * libgcc2.h: Add prototypes for __builtin_powi[lf]. * libgcc2.c: Add __builtin_powi[lf] implementation. * mklibgcc.in: Add __builtin_powi[lf] to lib2funcs. --- gcc/libgcc-std.ver.jj 2007-03-02 09:27:16.000000000 +0100 +++ gcc/libgcc-std.ver 2007-03-02 10:32:27.000000000 +0100 @@ -235,7 +235,39 @@ GCC_3.4.4 { __subvti3 } -%inherit GCC_4.2.0 GCC_3.4.4 +%inherit GCC_4.0.0 GCC_3.4.4 +GCC_4.0.0 { + # libgcc2 __builtin_powi helpers. + __powisf2 + __powidf2 + __powixf2 + __powitf2 + + # c99 compliant complex arithmetic + __divsc3 + __divdc3 + __divxc3 + __divtc3 + __mulsc3 + __muldc3 + __mulxc3 + __multc3 +} + +%inherit GCC_4.2.0 GCC_4.0.0 GCC_4.2.0 { + # unsigned-to-floating conversions + __floatunsisf + __floatunsidf + __floatunsixf + __floatunsitf + __floatundidf + __floatundisf + __floatundixf + __floatunditf + __floatuntidf + __floatuntisf + __floatuntixf + __floatuntitf _Unwind_GetIPInfo } --- gcc/libgcc2.h.jj 2006-10-05 00:37:01.000000000 +0200 +++ gcc/libgcc2.h 2007-03-02 11:26:31.000000000 +0100 @@ -88,12 +88,16 @@ typedef unsigned int UTItype __attribute typedef float SFtype __attribute__ ((mode (SF))); typedef float DFtype __attribute__ ((mode (DF))); +typedef _Complex float SCtype; +typedef _Complex double DCtype; #if LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 96 typedef float XFtype __attribute__ ((mode (XF))); +typedef _Complex long double XCtype; #endif #if LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 128 typedef float TFtype __attribute__ ((mode (TF))); +typedef _Complex long double TCtype; #endif #else /* BITS_PER_UNIT != 8 */ @@ -216,6 +220,10 @@ typedef int word_type __attribute__ ((mo #define __floatditf __NDW(float,tf) #define __floatdidf __NDW(float,df) #define __floatdisf __NDW(float,sf) +#define __floatundixf __NDW(floatun,xf) +#define __floatunditf __NDW(floatun,tf) +#define __floatundidf __NDW(floatun,df) +#define __floatundisf __NDW(floatun,sf) #define __fixunsxfSI __NW(fixunsxf,) #define __fixunstfSI __NW(fixunstf,) #define __fixunsdfSI __NW(fixunsdf,) @@ -293,27 +301,47 @@ extern SItype __negvsi2 (SItype); #endif /* COMPAT_SIMODE_TRAPPING_ARITHMETIC */ #if BITS_PER_UNIT == 8 +#undef int extern DWtype __fixdfdi (DFtype); extern DWtype __fixsfdi (SFtype); extern DFtype __floatdidf (DWtype); extern SFtype __floatdisf (DWtype); +extern DFtype __floatundidf (UDWtype); +extern SFtype __floatundisf (UDWtype); extern UWtype __fixunsdfSI (DFtype); extern UWtype __fixunssfSI (SFtype); extern DWtype __fixunsdfDI (DFtype); extern DWtype __fixunssfDI (SFtype); +extern SFtype __powisf2 (SFtype, int); +extern DFtype __powidf2 (DFtype, int); + +extern SCtype __divsc3 (SFtype, SFtype, SFtype, SFtype); +extern SCtype __mulsc3 (SFtype, SFtype, SFtype, SFtype); +extern DCtype __divdc3 (DFtype, DFtype, DFtype, DFtype); +extern DCtype __muldc3 (DFtype, DFtype, DFtype, DFtype); #if LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 96 extern DWtype __fixxfdi (XFtype); extern DWtype __fixunsxfDI (XFtype); extern XFtype __floatdixf (DWtype); +extern XFtype __floatundixf (UDWtype); extern UWtype __fixunsxfSI (XFtype); +extern XFtype __powixf2 (XFtype, int); +extern XCtype __divxc3 (XFtype, XFtype, XFtype, XFtype); +extern XCtype __mulxc3 (XFtype, XFtype, XFtype, XFtype); #endif #if LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 128 extern DWtype __fixunstfDI (TFtype); extern DWtype __fixtfdi (TFtype); extern TFtype __floatditf (DWtype); +extern TFtype __floatunditf (UDWtype); +extern TFtype __powitf2 (TFtype, int); +extern TCtype __divtc3 (TFtype, TFtype, TFtype, TFtype); +extern TCtype __multc3 (TFtype, TFtype, TFtype, TFtype); #endif + +#define int bogus_type #endif /* BITS_PER_UNIT == 8 */ /* DWstructs are pairs of Wtype values in the order determined by --- gcc/mklibgcc.in.jj 2006-10-05 00:37:01.000000000 +0200 +++ gcc/mklibgcc.in 2007-03-02 10:31:58.000000000 +0100 @@ -58,7 +58,9 @@ lib2funcs='_muldi3 _negdi2 _lshrdi3 _ash _enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors _ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab - _popcountsi2 _popcountdi2 _paritysi2 _paritydi2' + _popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 + _powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 + _divxc3 _divtc3 _floatundidf _floatundisf _floatundixf _floatunditf' # Disable SHLIB_LINK if shared libgcc not enabled. if [ "@enable_shared@" = "no" ]; then --- gcc/libgcc2.c.jj 2006-10-05 00:37:01.000000000 +0200 +++ gcc/libgcc2.c 2007-03-02 10:58:07.000000000 +0100 @@ -1331,6 +1331,23 @@ __floatdixf (DWtype u) } #endif +#if defined(L_floatundixf) && (LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 96) +#define WORD_SIZE (sizeof (Wtype) * BITS_PER_UNIT) +#define HIGH_HALFWORD_COEFF (((UDWtype) 1) << (WORD_SIZE / 2)) +#define HIGH_WORD_COEFF (((UDWtype) 1) << WORD_SIZE) + +XFtype +__floatundixf (UDWtype u) +{ + XFtype d = (UWtype) (u >> WORD_SIZE); + d *= HIGH_HALFWORD_COEFF; + d *= HIGH_HALFWORD_COEFF; + d += (UWtype) (u & (HIGH_WORD_COEFF - 1)); + + return d; +} +#endif + #if defined(L_floatditf) && (LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 128) #define WORD_SIZE (sizeof (Wtype) * BITS_PER_UNIT) #define HIGH_HALFWORD_COEFF (((UDWtype) 1) << (WORD_SIZE / 2)) @@ -1348,6 +1365,23 @@ __floatditf (DWtype u) } #endif +#if defined(L_floatunditf) && (LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 128) +#define WORD_SIZE (sizeof (Wtype) * BITS_PER_UNIT) +#define HIGH_HALFWORD_COEFF (((UDWtype) 1) << (WORD_SIZE / 2)) +#define HIGH_WORD_COEFF (((UDWtype) 1) << WORD_SIZE) + +TFtype +__floatunditf (UDWtype u) +{ + TFtype d = (UWtype) (u >> WORD_SIZE); + d *= HIGH_HALFWORD_COEFF; + d *= HIGH_HALFWORD_COEFF; + d += (UWtype) (u & (HIGH_WORD_COEFF - 1)); + + return d; +} +#endif + #ifdef L_floatdidf #define WORD_SIZE (sizeof (Wtype) * BITS_PER_UNIT) #define HIGH_HALFWORD_COEFF (((UDWtype) 1) << (WORD_SIZE / 2)) @@ -1365,6 +1399,23 @@ __floatdidf (DWtype u) } #endif +#ifdef L_floatundidf +#define WORD_SIZE (sizeof (Wtype) * BITS_PER_UNIT) +#define HIGH_HALFWORD_COEFF (((UDWtype) 1) << (WORD_SIZE / 2)) +#define HIGH_WORD_COEFF (((UDWtype) 1) << WORD_SIZE) + +DFtype +__floatundidf (UDWtype u) +{ + DFtype d = (UWtype) (u >> WORD_SIZE); + d *= HIGH_HALFWORD_COEFF; + d *= HIGH_HALFWORD_COEFF; + d += (UWtype) (u & (HIGH_WORD_COEFF - 1)); + + return d; +} +#endif + #ifdef L_floatdisf #define WORD_SIZE (sizeof (Wtype) * BITS_PER_UNIT) #define HIGH_HALFWORD_COEFF (((UDWtype) 1) << (WORD_SIZE / 2)) @@ -1409,6 +1460,49 @@ __floatdisf (DWtype u) } #endif +#ifdef L_floatundisf +#define WORD_SIZE (sizeof (Wtype) * BITS_PER_UNIT) +#define HIGH_HALFWORD_COEFF (((UDWtype) 1) << (WORD_SIZE / 2)) +#define HIGH_WORD_COEFF (((UDWtype) 1) << WORD_SIZE) + +#define DI_SIZE (sizeof (DWtype) * BITS_PER_UNIT) +#define DF_SIZE DBL_MANT_DIG +#define SF_SIZE FLT_MANT_DIG + +SFtype +__floatundisf (UDWtype u) +{ + /* Protect against double-rounding error. + Represent any low-order bits, that might be truncated in DFmode, + by a bit that won't be lost. The bit can go in anywhere below the + rounding position of the SFmode. A fixed mask and bit position + handles all usual configurations. It doesn't handle the case + of 128-bit DImode, however. */ + if (DF_SIZE < DI_SIZE + && DF_SIZE > (DI_SIZE - DF_SIZE + SF_SIZE)) + { +#define REP_BIT ((UDWtype) 1 << (DI_SIZE - DF_SIZE)) + if (u >= ((UDWtype) 1 << DF_SIZE)) + { + if ((UDWtype) u & (REP_BIT - 1)) + { + u &= ~ (REP_BIT - 1); + u |= REP_BIT; + } + } + } + /* Do the calculation in DFmode + so that we don't lose any of the precision of the high word + while multiplying it. */ + DFtype f = (UWtype) (u >> WORD_SIZE); + f *= HIGH_HALFWORD_COEFF; + f *= HIGH_HALFWORD_COEFF; + f += (UWtype) (u & (HIGH_WORD_COEFF - 1)); + + return (SFtype) f; +} +#endif + #if defined(L_fixunsxfsi) && LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 96 /* Reenable the normal types, in case limits.h needs them. */ #undef char @@ -1475,6 +1569,246 @@ __fixunssfSI (SFtype a) } #endif +/* Integer power helper used from __builtin_powi for non-constant + exponents. */ + +#if defined(L_powisf2) || defined(L_powidf2) \ + || (defined(L_powixf2) && LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 96) \ + || (defined(L_powitf2) && LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 128) +# if defined(L_powisf2) +# define TYPE SFtype +# define NAME __powisf2 +# elif defined(L_powidf2) +# define TYPE DFtype +# define NAME __powidf2 +# elif defined(L_powixf2) +# define TYPE XFtype +# define NAME __powixf2 +# elif defined(L_powitf2) +# define TYPE TFtype +# define NAME __powitf2 +# endif + +#undef int +#undef unsigned +TYPE +NAME (TYPE x, int m) +{ + unsigned int n = m < 0 ? -m : m; + TYPE y = n % 2 ? x : 1; + while (n >>= 1) + { + x = x * x; + if (n % 2) + y = y * x; + } + return m < 0 ? 1/y : y; +} + +#endif + +#if defined(L_mulsc3) || defined(L_divsc3) \ + || defined(L_muldc3) || defined(L_divdc3) \ + || (LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 96 \ + && (defined(L_mulxc3) || defined(L_divxc3))) \ + || (LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 128 \ + && (defined(L_multc3) || defined(L_divtc3))) + +#undef float +#undef double +#undef long + +#if defined(L_mulsc3) || defined(L_divsc3) +# define MTYPE SFtype +# define CTYPE SCtype +# define MODE sc +# define CEXT f +# define NOTRUNC __FLT_EVAL_METHOD__ == 0 +#elif defined(L_muldc3) || defined(L_divdc3) +# define MTYPE DFtype +# define CTYPE DCtype +# define MODE dc +# if LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 64 +# define CEXT l +# define NOTRUNC 1 +# else +# define CEXT +# define NOTRUNC __FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == 1 +# endif +#elif defined(L_mulxc3) || defined(L_divxc3) +# define MTYPE XFtype +# define CTYPE XCtype +# define MODE xc +# define CEXT l +# define NOTRUNC 1 +#elif defined(L_multc3) || defined(L_divtc3) +# define MTYPE TFtype +# define CTYPE TCtype +# define MODE tc +# define CEXT l +# define NOTRUNC 1 +#else +# error +#endif + +#define CONCAT3(A,B,C) _CONCAT3(A,B,C) +#define _CONCAT3(A,B,C) A##B##C + +#define CONCAT2(A,B) _CONCAT2(A,B) +#define _CONCAT2(A,B) A##B + +/* All of these would be present in a full C99 implementation of + and . Our problem is that only a few systems have such full + implementations. Further, libgcc_s.so isn't currently linked against + libm.so, and even for systems that do provide full C99, the extra overhead + of all programs using libgcc having to link against libm. So avoid it. */ + +#define isnan(x) __builtin_expect ((x) != (x), 0) +#define isfinite(x) __builtin_expect (!isnan((x) - (x)), 1) +#define isinf(x) __builtin_expect (!isnan(x) & !isfinite(x), 0) + +#define INFINITY CONCAT2(__builtin_inf, CEXT) () +#define I 1i + +/* Helpers to make the following code slightly less gross. */ +#define COPYSIGN CONCAT2(__builtin_copysign, CEXT) +#define FABS CONCAT2(__builtin_fabs, CEXT) + +/* Verify that MTYPE matches up with CEXT. */ +extern void *compile_type_assert[sizeof(INFINITY) == sizeof(MTYPE) ? 1 : -1]; + +/* Ensure that we've lost any extra precision. */ +#if NOTRUNC +# define TRUNC(x) +#else +# define TRUNC(x) __asm__ ("" : "=m"(x) : "m"(x)) +#endif + +#if defined(L_mulsc3) || defined(L_muldc3) \ + || defined(L_mulxc3) || defined(L_multc3) + +CTYPE +CONCAT3(__mul,MODE,3) (MTYPE a, MTYPE b, MTYPE c, MTYPE d) +{ + MTYPE ac, bd, ad, bc, x, y; + + ac = a * c; + bd = b * d; + ad = a * d; + bc = b * c; + + TRUNC (ac); + TRUNC (bd); + TRUNC (ad); + TRUNC (bc); + + x = ac - bd; + y = ad + bc; + + if (isnan (x) && isnan (y)) + { + /* Recover infinities that computed as NaN + iNaN. */ + _Bool recalc = 0; + if (isinf (a) || isinf (b)) + { + /* z is infinite. "Box" the infinity and change NaNs in + the other factor to 0. */ + a = COPYSIGN (isinf (a) ? 1 : 0, a); + b = COPYSIGN (isinf (b) ? 1 : 0, b); + if (isnan (c)) c = COPYSIGN (0, c); + if (isnan (d)) d = COPYSIGN (0, d); + recalc = 1; + } + if (isinf (c) || isinf (d)) + { + /* w is infinite. "Box" the infinity and change NaNs in + the other factor to 0. */ + c = COPYSIGN (isinf (c) ? 1 : 0, c); + d = COPYSIGN (isinf (d) ? 1 : 0, d); + if (isnan (a)) a = COPYSIGN (0, a); + if (isnan (b)) b = COPYSIGN (0, b); + recalc = 1; + } + if (!recalc + && (isinf (ac) || isinf (bd) + || isinf (ad) || isinf (bc))) + { + /* Recover infinities from overflow by changing NaNs to 0. */ + if (isnan (a)) a = COPYSIGN (0, a); + if (isnan (b)) b = COPYSIGN (0, b); + if (isnan (c)) c = COPYSIGN (0, c); + if (isnan (d)) d = COPYSIGN (0, d); + recalc = 1; + } + if (recalc) + { + x = INFINITY * (a * c - b * d); + y = INFINITY * (a * d + b * c); + } + } + + return x + I * y; +} +#endif /* complex multiply */ + +#if defined(L_divsc3) || defined(L_divdc3) \ + || defined(L_divxc3) || defined(L_divtc3) + +CTYPE +CONCAT3(__div,MODE,3) (MTYPE a, MTYPE b, MTYPE c, MTYPE d) +{ + MTYPE denom, ratio, x, y; + + /* ??? We can get better behavior from logarithmic scaling instead of + the division. But that would mean starting to link libgcc against + libm. We could implement something akin to ldexp/frexp as gcc builtins + fairly easily... */ + if (FABS (c) < FABS (d)) + { + ratio = c / d; + denom = (c * ratio) + d; + x = ((a * ratio) + b) / denom; + y = ((b * ratio) - a) / denom; + } + else + { + ratio = d / c; + denom = (d * ratio) + c; + x = ((b * ratio) + a) / denom; + y = (b - (a * ratio)) / denom; + } + + /* Recover infinities and zeros that computed as NaN+iNaN; the only cases + are nonzero/zero, infinite/finite, and finite/infinite. */ + if (isnan (x) && isnan (y)) + { + if (c == 0.0 && d == 0.0 && (!isnan (a) || !isnan (b))) + { + x = COPYSIGN (INFINITY, c) * a; + y = COPYSIGN (INFINITY, c) * b; + } + else if ((isinf (a) || isinf (b)) && isfinite (c) && isfinite (d)) + { + a = COPYSIGN (isinf (a) ? 1 : 0, a); + b = COPYSIGN (isinf (b) ? 1 : 0, b); + x = INFINITY * (a * c + b * d); + y = INFINITY * (b * c - a * d); + } + else if ((isinf (c) || isinf (d)) && isfinite (a) && isfinite (b)) + { + c = COPYSIGN (isinf (c) ? 1 : 0, c); + d = COPYSIGN (isinf (d) ? 1 : 0, d); + x = 0.0 * (a * c + b * d); + y = 0.0 * (b * c - a * d); + } + } + + return x + I * y; +} +#endif /* complex divide */ + +#endif /* all complex float routines */ + /* From here on down, the routines use normal data types. */ #define SItype bogus_type gcc34-rh205919.patch: cp/typeck.c | 2 +- testsuite/g++.dg/template/array17.C | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) --- NEW FILE gcc34-rh205919.patch --- 2006-12-08 Alexandre Oliva * g++.dg/template/array17.C: New test. 2006-10-27 Alexandre Oliva * typeck.c (non_reference): Don't dereference NULL type. --- gcc/cp/typeck.c.orig 2005-11-21 11:56:03.000000000 -0200 +++ gcc/cp/typeck.c 2006-10-27 03:28:04.000000000 -0300 @@ -6443,7 +6443,7 @@ casts_away_constness (tree t1, tree t2) tree non_reference (tree t) { - if (TREE_CODE (t) == REFERENCE_TYPE) + if (t != NULL_TREE && TREE_CODE (t) == REFERENCE_TYPE) t = TREE_TYPE (t); return t; } --- 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 >()); +} gcc34-rh207277.patch: ifcvt.c | 33 +++++++++++++++++++-------------- testsuite/g++.dg/opt/ifcvt1.C | 17 +++++++++++++++++ testsuite/gcc.dg/ifcvt-fabs-1.c | 21 +++++++++++++++++++++ 3 files changed, 57 insertions(+), 14 deletions(-) --- NEW FILE gcc34-rh207277.patch --- 2006-12-08 Jakub Jelinek * g++.dg/opt/ifcvt1.C: New test. 2005-11-09 Eric Botcazou * ifcvt.c (noce_get_alt_condition): Use prev_nonnote_insn. (noce_try_abs): Negate if the comparison is reversed. Look only one instruction backwards for a REG_EQUAL note. * gcc.dg/ifcvt-fabs-1.c: New test. --- gcc/ifcvt.c.orig 2005-11-21 11:43:21.000000000 -0200 +++ gcc/ifcvt.c 2006-10-26 02:21:07.000000000 -0300 @@ -1406,7 +1406,7 @@ noce_get_alt_condition (struct noce_if_i rtx prev_insn; /* First, look to see if we put a constant in a register. */ - prev_insn = PREV_INSN (if_info->cond_earliest); + prev_insn = prev_nonnote_insn (if_info->cond_earliest); if (prev_insn && INSN_P (prev_insn) && GET_CODE (PATTERN (prev_insn)) == SET) @@ -1642,25 +1642,30 @@ noce_try_abs (struct noce_if_info *if_in if (rtx_equal_p (XEXP (cond, 0), b)) c = XEXP (cond, 1); else if (rtx_equal_p (XEXP (cond, 1), b)) - c = XEXP (cond, 0); + { + c = XEXP (cond, 0); + negate = !negate; + } else return FALSE; - /* Verify that C is zero. Search backward through the block for - a REG_EQUAL note if necessary. */ + /* Verify that C is zero. Search one step backward for a + REG_EQUAL note or a simple source if necessary. */ if (REG_P (c)) { - rtx insn, note = NULL; - for (insn = earliest; - insn != BB_HEAD (if_info->test_bb); - insn = PREV_INSN (insn)) - if (INSN_P (insn) - && ((note = find_reg_note (insn, REG_EQUAL, c)) - || (note = find_reg_note (insn, REG_EQUIV, c)))) - break; - if (! note) + rtx set, insn = prev_nonnote_insn (earliest); + if (insn + && (set = single_set (insn)) + && rtx_equal_p (SET_DEST (set), c)) + { + rtx note = find_reg_equal_equiv_note (insn); + if (note) + c = XEXP (note, 0); + else + c = SET_SRC (set); + } + else return FALSE; - c = XEXP (note, 0); } if (GET_CODE (c) == MEM && GET_CODE (XEXP (c, 0)) == SYMBOL_REF --- gcc/testsuite/gcc.dg/ifcvt-fabs-1.c 1970-01-01 00:00:00.000000000 +0000 +++ gcc/testsuite/gcc.dg/ifcvt-fabs-1.c 2006-10-26 02:20:24.000000000 -0300 @@ -0,0 +1,21 @@ +/* { dg-do run } */ +/* { dg-options "-O" } */ +/* { dg-options "-O -march=i686" { target i686-*-* } } */ + +extern void abort(void); + +float foo(float f) +{ + if (f < 0.0f) + f = -f; + + return f; +} + +int main(void) +{ + if (foo (-1.0f) != 1.0f) + abort (); + + return 0; +} --- 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; +} gcc34-var-tracking-coalesce.patch: testsuite/g++.dg/debug/vartrack1.C | 99 ++++++++++ var-tracking.c | 359 ++++++++++++++++++++++++++++++------- 2 files changed, 391 insertions(+), 67 deletions(-) --- NEW FILE gcc34-var-tracking-coalesce.patch --- 2006-12-08 Jakub Jelinek * g++.dg/debug/vartrack1.C: New test. 2006-09-11 Alexandre Oliva PR target/28672 * var-tracking.c (dump_dataflow_set): Start dumping at register zero. (clobber_variable_part): Kill only the variable part in registers holding it, leaving other variables alone. 2006-08-09 Alexandre Oliva * var-tracking.c (enum micro_operation_type): Add MO_COPY. (var_debug_decl): New function. (var_reg_set): Follow debug decl link. Add location even if reg is already known to hold some other variable. (var_mem_set): Follow debug decl link. (var_reg_delete_and_set, var_mem_delete_and_set): Follow debug decl link. Delete other known locations of the variable part if requested. (var_reg_delete, var_mem_delete): Delete other known locations of the variable part if requested. (same_variable_part_p): New function. (add_stores): Select MO_COPY when appropriate. (vt_initialize): Handle it. (compute_bb_dataflow, emit_notes_in_bb): Likewise. Delete known locations for MO_SET and MO_CLOBBER. (find_variable_location_part): New function. (set_variable_part, delete_variable_part): Use it. (clobber_variable_part): New function. --- gcc/var-tracking.c.orig 2006-12-08 02:14:36.000000000 -0200 +++ gcc/var-tracking.c 2006-12-08 02:14:51.000000000 -0200 @@ -112,6 +112,8 @@ enum micro_operation_type MO_USE_NO_VAR,/* Use location which is not associated with a variable or the variable is not trackable. */ MO_SET, /* Set location. */ + MO_COPY, /* Copy the same portion of a variable from one + loation to another. */ MO_CLOBBER, /* Clobber location. */ MO_CALL, /* Call insn. */ MO_ADJUST /* Adjust stack pointer. */ @@ -293,13 +295,14 @@ static void vars_clear (htab_t); static variable unshare_variable (dataflow_set *set, variable var); static int vars_copy_1 (void **, void *); static void vars_copy (htab_t, htab_t); +static tree var_debug_decl (tree); static void var_reg_set (dataflow_set *, rtx); -static void var_reg_delete_and_set (dataflow_set *, rtx); -static void var_reg_delete (dataflow_set *, rtx); +static void var_reg_delete_and_set (dataflow_set *, rtx, bool); +static void var_reg_delete (dataflow_set *, rtx, bool); static void var_regno_delete (dataflow_set *, int); static void var_mem_set (dataflow_set *, rtx); -static void var_mem_delete_and_set (dataflow_set *, rtx); -static void var_mem_delete (dataflow_set *, rtx); +static void var_mem_delete_and_set (dataflow_set *, rtx, bool); +static void var_mem_delete (dataflow_set *, rtx, bool); static void dataflow_set_init (dataflow_set *, int); static void dataflow_set_clear (dataflow_set *); @@ -316,6 +319,7 @@ static void dataflow_set_destroy (datafl static bool contains_symbol_ref (rtx); static bool track_expr_p (tree); +static bool same_variable_part_p (rtx, tree, HOST_WIDE_INT); static int count_uses (rtx *, void *); static void count_uses_1 (rtx *, void *); static void count_stores (rtx, rtx, void *); @@ -333,6 +337,7 @@ static void dump_dataflow_sets (void); static void variable_was_changed (variable, htab_t); static void set_variable_part (dataflow_set *, rtx, tree, HOST_WIDE_INT); +static void clobber_variable_part (dataflow_set *, rtx, tree, HOST_WIDE_INT); static void delete_variable_part (dataflow_set *, rtx, tree, HOST_WIDE_INT); static int emit_note_insn_var_location (void **, void *); static void emit_notes_for_changes (rtx, enum emit_note_where); @@ -794,6 +799,14 @@ vars_copy (htab_t dst, htab_t src) htab_traverse (src, vars_copy_1, dst); } +/* Map a decl to its main debug decl. */ + +static inline tree +var_debug_decl (tree decl) +{ + return decl; +} + /* Set the register to contain REG_EXPR (LOC), REG_OFFSET (LOC). */ static void @@ -801,23 +814,35 @@ var_reg_set (dataflow_set *set, rtx loc) { tree decl = REG_EXPR (loc); HOST_WIDE_INT offset = REG_OFFSET (loc); + attrs node; + + decl = var_debug_decl (decl); - if (set->regs[REGNO (loc)] == NULL) + for (node = set->regs[REGNO (loc)]; node; node = node->next) + if (node->decl == decl && node->offset == offset) + break; + if (!node) attrs_list_insert (&set->regs[REGNO (loc)], decl, offset, loc); set_variable_part (set, loc, decl, offset); } -/* Delete current content of register LOC in dataflow set SET - and set the register to contain REG_EXPR (LOC), REG_OFFSET (LOC). */ +/* Delete current content of register LOC in dataflow set SET and set + the register to contain REG_EXPR (LOC), REG_OFFSET (LOC). If + MODIFY is true, any other live copies of the same variable part are + also deleted from the dataflow set, otherwise the variable part is + assumed to be copied from another location holding the same + part. */ static void -var_reg_delete_and_set (dataflow_set *set, rtx loc) +var_reg_delete_and_set (dataflow_set *set, rtx loc, bool modify) { tree decl = REG_EXPR (loc); HOST_WIDE_INT offset = REG_OFFSET (loc); attrs node, next; attrs *nextp; + decl = var_debug_decl (decl); + nextp = &set->regs[REGNO (loc)]; for (node = *nextp; node; node = next) { @@ -834,17 +859,31 @@ var_reg_delete_and_set (dataflow_set *se nextp = &node->next; } } + if (modify) + clobber_variable_part (set, loc, decl, offset); var_reg_set (set, loc); } -/* Delete current content of register LOC in dataflow set SET. */ +/* Delete current content of register LOC in dataflow set SET. If + CLOBBER is true, also delete any other live copies of the same + variable part. */ static void -var_reg_delete (dataflow_set *set, rtx loc) +var_reg_delete (dataflow_set *set, rtx loc, bool clobber) { attrs *reg = &set->regs[REGNO (loc)]; attrs node, next; + if (clobber) + { + tree decl = REG_EXPR (loc); + HOST_WIDE_INT offset = REG_OFFSET (loc); + + decl = var_debug_decl (decl); + + clobber_variable_part (set, NULL, decl, offset); + } + for (node = *reg; node; node = next) { next = node->next; @@ -881,28 +920,44 @@ var_mem_set (dataflow_set *set, rtx loc) tree decl = MEM_EXPR (loc); HOST_WIDE_INT offset = MEM_OFFSET (loc) ? INTVAL (MEM_OFFSET (loc)) : 0; + decl = var_debug_decl (decl); + set_variable_part (set, loc, decl, offset); } -/* Delete and set the location part of variable MEM_EXPR (LOC) - in dataflow set SET to LOC. +/* Delete and set the location part of variable MEM_EXPR (LOC) in + dataflow set SET to LOC. If MODIFY is true, any other live copies + of the same variable part are also deleted from the dataflow set, + otherwise the variable part is assumed to be copied from another + location holding the same part. Adjust the address first if it is stack pointer based. */ static void -var_mem_delete_and_set (dataflow_set *set, rtx loc) +var_mem_delete_and_set (dataflow_set *set, rtx loc, bool modify) { + tree decl = MEM_EXPR (loc); + HOST_WIDE_INT offset = MEM_OFFSET (loc) ? INTVAL (MEM_OFFSET (loc)) : 0; + + decl = var_debug_decl (decl); + + if (modify) + clobber_variable_part (set, NULL, decl, offset); var_mem_set (set, loc); } -/* Delete the location part LOC from dataflow set SET. +/* Delete the location part LOC from dataflow set SET. If CLOBBER is + true, also delete any other live copies of the same variable part. Adjust the address first if it is stack pointer based. */ static void -var_mem_delete (dataflow_set *set, rtx loc) +var_mem_delete (dataflow_set *set, rtx loc, bool clobber) { tree decl = MEM_EXPR (loc); HOST_WIDE_INT offset = MEM_OFFSET (loc) ? INTVAL (MEM_OFFSET (loc)) : 0; + decl = var_debug_decl (decl); + if (clobber) + clobber_variable_part (set, NULL, decl, offset); delete_variable_part (set, loc, decl, offset); } @@ -1476,6 +1531,41 @@ track_expr_p (tree expr) return 1; } +/* Determine whether a given LOC refers to the same variable part as + EXPR+OFFSET. */ + +static bool +same_variable_part_p (rtx loc, tree expr, HOST_WIDE_INT offset) +{ + tree expr2; + HOST_WIDE_INT offset2; + + if (! DECL_P (expr)) + return false; + + if (GET_CODE (loc) == REG) + { + expr2 = REG_EXPR (loc); + offset2 = REG_OFFSET (loc); + } + else if (GET_CODE (loc) == MEM) + { + expr2 = MEM_EXPR (loc); + offset2 = MEM_OFFSET (loc) ? INTVAL (MEM_OFFSET (loc)) : 0; + } + else + return false; + + if (! expr2 || ! DECL_P (expr2)) + return false; + + expr = var_debug_decl (expr); + expr2 = var_debug_decl (expr2); + + return (expr == expr2 && offset == offset2); +} + + /* Count uses (register and memory references) LOC which will be tracked. INSN is instruction which the LOC is part of. */ @@ -1570,9 +1660,18 @@ add_stores (rtx loc, rtx expr, void *ins basic_block bb = BLOCK_FOR_INSN ((rtx) insn); micro_operation *mo = VTI (bb)->mos + VTI (bb)->n_mos++; - mo->type = ((GET_CODE (expr) != CLOBBER && REG_EXPR (loc) - && track_expr_p (REG_EXPR (loc))) - ? MO_SET : MO_CLOBBER); + if (GET_CODE (expr) == CLOBBER + || ! REG_EXPR (loc) + || ! track_expr_p (REG_EXPR (loc))) + mo->type = MO_CLOBBER; + else if (GET_CODE (expr) == SET + && SET_DEST (expr) == loc + && same_variable_part_p (SET_SRC (expr), + REG_EXPR (loc), + REG_OFFSET (loc))) + mo->type = MO_COPY; + else + mo->type = MO_SET; mo->u.loc = loc; mo->insn = NEXT_INSN ((rtx) insn); } @@ -1583,7 +1682,17 @@ add_stores (rtx loc, rtx expr, void *ins basic_block bb = BLOCK_FOR_INSN ((rtx) insn); micro_operation *mo = VTI (bb)->mos + VTI (bb)->n_mos++; - mo->type = GET_CODE (expr) == CLOBBER ? MO_CLOBBER : MO_SET; + if (GET_CODE (expr) == CLOBBER) + mo->type = MO_CLOBBER; + else if (GET_CODE (expr) == SET + && SET_DEST (expr) == loc + && same_variable_part_p (SET_SRC (expr), + MEM_EXPR (loc), + MEM_OFFSET (loc) + ? INTVAL (MEM_OFFSET (loc)) : 0)) + mo->type = MO_COPY; + else + mo->type = MO_SET; mo->u.loc = loc; mo->insn = NEXT_INSN ((rtx) insn); } @@ -1631,21 +1740,42 @@ compute_bb_dataflow (basic_block bb) rtx loc = VTI (bb)->mos[i].u.loc; if (GET_CODE (loc) == REG) - var_reg_delete_and_set (out, loc); + var_reg_delete_and_set (out, loc, true); else if (GET_CODE (loc) == MEM) - var_mem_delete_and_set (out, loc); + var_mem_delete_and_set (out, loc, true); + } + break; + + case MO_COPY: + { + rtx loc = VTI (bb)->mos[i].u.loc; + + if (GET_CODE (loc) == REG) + var_reg_delete_and_set (out, loc, false); + else if (GET_CODE (loc) == MEM) + var_mem_delete_and_set (out, loc, false); } break; case MO_USE_NO_VAR: + { + rtx loc = VTI (bb)->mos[i].u.loc; + + if (GET_CODE (loc) == REG) + var_reg_delete (out, loc, false); + else if (GET_CODE (loc) == MEM) + var_mem_delete (out, loc, false); + } + break; + case MO_CLOBBER: { rtx loc = VTI (bb)->mos[i].u.loc; if (GET_CODE (loc) == REG) - var_reg_delete (out, loc); + var_reg_delete (out, loc, true); else if (GET_CODE (loc) == MEM) - var_mem_delete (out, loc); + var_mem_delete (out, loc, true); } break; @@ -1824,7 +1954,7 @@ dump_dataflow_set (dataflow_set *set) fprintf (rtl_dump_file, "Stack adjustment: " HOST_WIDE_INT_PRINT_DEC "\n", set->stack_adjust); - for (i = 1; i < FIRST_PSEUDO_REGISTER; i++) + for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) { if (set->regs[i]) { @@ -1905,6 +2035,39 @@ variable_was_changed (variable var, htab } } +/* Look for the index in VAR->var_part corresponding to OFFSET. + Return -1 if not found. If INSERTION_POINT is non-NULL, the + referenced int will be set to the index that the part has or should + have, if it should be inserted. */ + +static inline int +find_variable_location_part (variable var, HOST_WIDE_INT offset, + int *insertion_point) +{ + int pos, low, high; + + /* Find the location part. */ + low = 0; + high = var->n_var_parts; + while (low != high) + { + pos = (low + high) / 2; + if (var->var_part[pos].offset < offset) + low = pos + 1; + else + high = pos; + } + pos = low; + + if (insertion_point) + *insertion_point = pos; + + if (pos < var->n_var_parts && var->var_part[pos].offset == offset) + return pos; + + return -1; +} + /* Set the part of variable's location in the dataflow set SET. The variable part is specified by variable's declaration DECL and offset OFFSET and the part's location by LOC. */ @@ -1912,7 +2075,7 @@ variable_was_changed (variable var, htab static void set_variable_part (dataflow_set *set, rtx loc, tree decl, HOST_WIDE_INT offset) { - int pos, low, high; + int pos; location_chain node, next; location_chain *nextp; variable var; @@ -1935,22 +2098,13 @@ set_variable_part (dataflow_set *set, rt } else { + int inspos = 0; + var = (variable) *slot; - /* Find the location part. */ - low = 0; - high = var->n_var_parts; - while (low != high) - { - pos = (low + high) / 2; - if (var->var_part[pos].offset < offset) - low = pos + 1; - else - high = pos; - } - pos = low; + pos = find_variable_location_part (var, offset, &inspos); - if (pos < var->n_var_parts && var->var_part[pos].offset == offset) + if (pos >= 0) { node = var->var_part[pos].loc_chain; @@ -1985,10 +2139,10 @@ set_variable_part (dataflow_set *set, rt abort (); #endif - /* We have to move the elements of array starting at index low to the - next position. */ - for (high = var->n_var_parts; high > low; high--) - var->var_part[high] = var->var_part[high - 1]; + /* We have to move the elements of array starting at index + inspos to the next position. */ + for (pos = var->n_var_parts; pos > inspos; pos--) + var->var_part[pos] = var->var_part[pos - 1]; var->n_var_parts++; var->var_part[pos].offset = offset; @@ -2028,6 +2182,67 @@ set_variable_part (dataflow_set *set, rt } } +/* Remove all recorded register locations for the given variable part + from dataflow set SET, except for those that are identical to loc. + The variable part is specified by variable's declaration DECL and + offset OFFSET. */ + +static void +clobber_variable_part (dataflow_set *set, rtx loc, tree decl, + HOST_WIDE_INT offset) +{ + void **slot; + + if (! decl || ! DECL_P (decl)) + return; + + slot = htab_find_slot_with_hash (set->vars, decl, VARIABLE_HASH_VAL (decl), + NO_INSERT); + if (slot) + { + variable var = (variable) *slot; + int pos = find_variable_location_part (var, offset, NULL); + + if (pos >= 0) + { + location_chain node, next; + + /* Remove the register locations from the dataflow set. */ + next = var->var_part[pos].loc_chain; + for (node = next; node; node = next) + { + next = node->next; + if (node->loc != loc) + { + if (REG_P (node->loc)) + { + attrs anode, anext; + attrs *anextp; + + /* Remove the variable part from the register's + list, but preserve any other variable parts + that might be regarded as live in that same + register. */ + anextp = &set->regs[REGNO (node->loc)]; + for (anode = *anextp; anode; anode = anext) + { + anext = anode->next; + if (anode->decl == decl + && anode->offset == offset) + { + pool_free (attrs_pool, anode); + *anextp = anext; + } + } + } + + delete_variable_part (set, node->loc, decl, offset); + } + } + } + } +} + /* Delete the part of variable's location from dataflow set SET. The variable part is specified by variable's declaration DECL and offset OFFSET and the part's location by LOC. */ @@ -2036,7 +2251,6 @@ static void delete_variable_part (dataflow_set *set, rtx loc, tree decl, HOST_WIDE_INT offset) { - int pos, low, high; void **slot; slot = htab_find_slot_with_hash (set->vars, decl, VARIABLE_HASH_VAL (decl), @@ -2044,21 +2258,9 @@ delete_variable_part (dataflow_set *set, if (slot) { variable var = (variable) *slot; + int pos = find_variable_location_part (var, offset, NULL); - /* Find the location part. */ - low = 0; - high = var->n_var_parts; - while (low != high) - { - pos = (low + high) / 2; - if (var->var_part[pos].offset < offset) - low = pos + 1; - else - high = pos; - } - pos = low; - - if (pos < var->n_var_parts && var->var_part[pos].offset == offset) + if (pos >= 0) { location_chain node, next; location_chain *nextp; @@ -2124,7 +2326,7 @@ delete_variable_part (dataflow_set *set, } } if (changed) - variable_was_changed (var, set->vars); + variable_was_changed (var, set->vars); } } } @@ -2418,28 +2620,50 @@ emit_notes_in_bb (basic_block bb) rtx loc = VTI (bb)->mos[i].u.loc; if (GET_CODE (loc) == REG) - var_reg_delete_and_set (&set, loc); + var_reg_delete_and_set (&set, loc, true); + else + var_mem_delete_and_set (&set, loc, true); + + emit_notes_for_changes (insn, EMIT_NOTE_BEFORE_INSN); + } + break; + + case MO_COPY: + { + rtx loc = VTI (bb)->mos[i].u.loc; + + if (GET_CODE (loc) == REG) + var_reg_delete_and_set (&set, loc, false); else - var_mem_delete_and_set (&set, loc); + var_mem_delete_and_set (&set, loc, false); emit_notes_for_changes (insn, EMIT_NOTE_BEFORE_INSN); } break; case MO_USE_NO_VAR: - case MO_CLOBBER: { rtx loc = VTI (bb)->mos[i].u.loc; if (GET_CODE (loc) == REG) - var_reg_delete (&set, loc); + var_reg_delete (&set, loc, false); else - var_mem_delete (&set, loc); + var_mem_delete (&set, loc, false); + + emit_notes_for_changes (insn, EMIT_NOTE_AFTER_INSN); + } + break; + + case MO_CLOBBER: + { + rtx loc = VTI (bb)->mos[i].u.loc; - if (VTI (bb)->mos[i].type == MO_USE_NO_VAR) - emit_notes_for_changes (insn, EMIT_NOTE_AFTER_INSN); + if (GET_CODE (loc) == REG) + var_reg_delete (&set, loc, true); else - emit_notes_for_changes (insn, EMIT_NOTE_BEFORE_INSN); + var_mem_delete (&set, loc, true); + + emit_notes_for_changes (insn, EMIT_NOTE_BEFORE_INSN); } break; @@ -2673,7 +2897,8 @@ vt_initialize (void) { while (n1 < n2 && VTI (bb)->mos[n1].type == MO_CLOBBER) n1++; - while (n1 < n2 && VTI (bb)->mos[n2].type == MO_SET) + while (n1 < n2 && (VTI (bb)->mos[n2].type == MO_SET + || VTI (bb)->mos[n2].type == MO_COPY)) n2--; if (n1 < n2) { --- 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; + } + } + } +} Index: compat-gcc-34.spec =================================================================== RCS file: /cvs/dist/rpms/compat-gcc-34/devel/compat-gcc-34.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- compat-gcc-34.spec 23 Aug 2006 07:49:57 -0000 1.5 +++ compat-gcc-34.spec 3 Mar 2007 13:29:46 -0000 1.6 @@ -16,7 +16,7 @@ Summary: Compatibility GNU Compiler Collection Name: compat-gcc-34 Version: 3.4.6 -Release: 4 +Release: 7 License: GPL Group: Development/Languages Source0: gcc-%{version}-%{DATE}.tar.bz2 @@ -95,6 +95,14 @@ Patch37: gcc34-pr26208-workaround.patch Patch38: gcc34-libgcc_eh-hidden.patch Patch39: gcc34-frame-base-loclist.patch +Patch40: gcc34-CVE-2006-3619.patch +Patch41: gcc34-dwarf2-inline-details-fix.patch +Patch42: gcc34-CXXABI131.patch +Patch43: gcc34-rh205919.patch +Patch44: gcc34-rh207277.patch +Patch45: gcc34-var-tracking-coalesce.patch +Patch46: gcc34-java-zoneinfo.patch +Patch47: gcc34-libgcc-additions.patch Patch100: gcc34-ldbl-hack.patch @@ -198,6 +206,14 @@ %patch37 -p0 -b .pr26208-workaround~ %patch38 -p0 -b .libgcc_eh-hidden~ %patch39 -p0 -b .frame-base-loclist~ +%patch40 -p0 -b .CVE-2006-3619~ +%patch41 -p0 -b .dwarf2-inline-details-fix~ +%patch42 -p0 -b .CXXABI131~ +%patch43 -p0 -b .rh205919~ +%patch44 -p0 -b .rh207277~ +%patch45 -p0 -b .var-tracking-coalesce~ +%patch46 -p0 -b .java-zoneinfo~ +%patch47 -p0 -b .libgcc-additions~ %patch100 -p0 -b .ldbl-hack~ @@ -445,6 +461,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib*/libiberty.a rm -f $RPM_BUILD_ROOT/lib*/libgcc_s* +rm -f $RPM_BUILD_ROOT%{_prefix}/bin/cpp %ifarch %{multilib_64_archs} # Remove libraries for the other arch on multilib arches @@ -465,12 +482,12 @@ %post g77 /sbin/install-info \ - --info-dir=%{_infodir} %{_infodir}/g77.info.gz + --info-dir=%{_infodir} %{_infodir}/g77.info.gz || : %preun g77 if [ $1 = 0 ]; then /sbin/install-info --delete \ - --info-dir=%{_infodir} %{_infodir}/g77.info.gz + --info-dir=%{_infodir} %{_infodir}/g77.info.gz || : fi %post -n compat-libf2c-34 -p /sbin/ldconfig @@ -621,6 +638,16 @@ %{_prefix}/%{_lib}/libg2c.so.0* %changelog +* Sat Mar 3 2007 Jakub Jelinek 3.4.6-7 +- ignore install-info failures in scriptlets (#223680) +- don't include cpp.debug in compat-gcc-34-debuginfo (#227021) +- fix .debug_line for inline function parameter blocks + (Alexandre Oliva, #214353) +- fix hang in vt_find_locations with -O{2,3} -g + (Alexandre Oliva, #216695, #218377) +- fix if-conversion ICE (Eric Botcazou, #207277) +- fix template instantiation ICE (Alexandre Oliva, #205919) + * Wed Aug 23 2006 Jakub Jelinek 3.4.6-4 - buildrequire elfutils-devel, so that libgcc_s is properly built on ia64 From fedora-cvs-commits at redhat.com Sat Mar 3 15:24:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 3 Mar 2007 10:24:35 -0500 Subject: rpms/audit/FC-6 audit-1.5.patch,NONE,1.1 audit.spec,1.121,1.122 Message-ID: <200703031524.l23FOZkq007995@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7921 Modified Files: audit.spec Added Files: audit-1.5.patch Log Message: * Sat Mar 03 2007 Steve Grubb 1.4.2-3 - Added NISPOM sample rules - Verify accessibility of files passed in auparse_init - Fix bug in parser library interpreting socketcalls - Add support for stdio FILE pointer in auparse_init - Adjust init script to allow anyone to status auditd (#230626) audit-1.5.patch: auparse/auparse-defs.h | 2 auparse/auparse.c | 18 ++ auparse/ellist.c | 2 auparse/interpret.c | 2 auparse/test/Makefile | 2 contrib/nispom.rules | 91 ++++++++++++ docs/auparse_init.3 | 1 init.d/auditd.init | 16 +- src/auditd-config.c | 367 ++++++++++++++++++++++++------------------------- 9 files changed, 308 insertions(+), 193 deletions(-) --- NEW FILE audit-1.5.patch --- diff -urp audit-1.4.2/auparse/auparse.c audit-1.5.1/auparse/auparse.c --- audit-1.4.2/auparse/auparse.c 2007-02-19 15:19:12.000000000 -0500 +++ audit-1.5.1/auparse/auparse.c 2007-03-02 16:27:22.000000000 -0500 @@ -101,11 +101,13 @@ auparse_state_t *auparse_init(ausource_t case AUSOURCE_LOGS: if (geteuid()) { errno = EPERM; - return NULL; + goto bad_exit; } setup_log_file_array(au); break; case AUSOURCE_FILE: + if (access(b, R_OK)) + goto bad_exit; tmp = malloc(2*sizeof(char *)); tmp[0] = strdup(b); tmp[1] = NULL; @@ -113,8 +115,11 @@ auparse_state_t *auparse_init(ausource_t break; case AUSOURCE_FILE_ARRAY: n = 0; - while (bb[n]) + while (bb[n]) { + if (access(bb[n], R_OK)) + goto bad_exit; n++; + } tmp = malloc(n*sizeof(char *)); for (i=0; iin = fdopen(n, "r"); au->source_list = NULL; break; + case AUSOURCE_FILE_POINTER: + au->in = (FILE *)b; + au->source_list = NULL; + break; default: errno = EINVAL; return NULL; @@ -161,6 +170,9 @@ auparse_state_t *auparse_init(ausource_t au->search_how = AUSEARCH_RULE_CLEAR; return au; +bad_exit: + free(au); + return NULL; } @@ -177,6 +189,7 @@ int auparse_reset(auparse_state_t *au) case AUSOURCE_LOGS: case AUSOURCE_FILE: case AUSOURCE_FILE_ARRAY: + case AUSOURCE_FILE_POINTER: if (au->in) { fclose(au->in); au->in = NULL; @@ -452,6 +465,7 @@ static int retrieve_next_line(auparse_st switch (au->source) { case AUSOURCE_DESCRIPTOR: + case AUSOURCE_FILE_POINTER: // loop reading lines from a descriptor do { // Get next buffer from file diff -urp audit-1.4.2/auparse/auparse-defs.h audit-1.5.1/auparse/auparse-defs.h --- audit-1.4.2/auparse/auparse-defs.h 2007-02-16 13:55:40.000000000 -0500 +++ audit-1.5.1/auparse/auparse-defs.h 2007-03-02 16:23:51.000000000 -0500 @@ -35,7 +35,7 @@ extern "C" { /* This tells the library where the data source is located */ typedef enum { AUSOURCE_LOGS, AUSOURCE_FILE, AUSOURCE_FILE_ARRAY, AUSOURCE_BUFFER, AUSOURCE_BUFFER_ARRAY, - AUSOURCE_DESCRIPTOR } ausource_t; + AUSOURCE_DESCRIPTOR, AUSOURCE_FILE_POINTER } ausource_t; /* This defines the types of searches that can be done */ typedef enum { AUSEARCH_UNSET, AUSEARCH_EXISTS, AUSEARCH_EQUAL, diff -urp audit-1.4.2/auparse/ellist.c audit-1.5.1/auparse/ellist.c --- audit-1.4.2/auparse/ellist.c 2007-02-16 09:45:12.000000000 -0500 +++ audit-1.5.1/auparse/ellist.c 2007-03-02 15:59:34.000000000 -0500 @@ -124,7 +124,7 @@ static int parse_up_record(rnode* r) nvlist_append(&r->nv, &n); if (r->nv.cnt == 1 && strcmp(n.name, "type") == 0) { r->type = audit_name_to_msg_type(n.val); - } else if(r->nv.cnt == 7 && strcmp(n.name, "a0") == 0){ + } else if(r->nv.cnt == 6 && strcmp(n.name, "a0") == 0){ errno = 0; r->a0 = strtoull(n.val, NULL, 16); if (errno) diff -urp audit-1.4.2/auparse/interpret.c audit-1.5.1/auparse/interpret.c --- audit-1.4.2/auparse/interpret.c 2007-02-19 13:51:51.000000000 -0500 +++ audit-1.5.1/auparse/interpret.c 2007-03-02 16:15:50.000000000 -0500 @@ -402,7 +402,7 @@ static const char *print_syscall(const c char *out; int ival; - if (machine <= 0) + if (machine < 0) machine = audit_detect_machine(); if (machine < 0) { out = strdup(val); diff -urp audit-1.4.2/auparse/test/Makefile audit-1.5.1/auparse/test/Makefile --- audit-1.4.2/auparse/test/Makefile 2007-03-03 10:04:32.000000000 -0500 +++ audit-1.5.1/auparse/test/Makefile 2007-03-02 16:17:38.000000000 -0500 @@ -4,7 +4,7 @@ LIBS=-lauparse -laudit all: auparse_test auparse_test: auparse_test.c - gcc $(CFLAGS) auparse_test.c -o auparse_test -L../.libs/ $(LIBS) + gcc $(CFLAGS) auparse_test.c -o auparse_test -L../.libs/ -L../../lib/.libs $(LIBS) check: auparse_test ./auparse_test diff -urp audit-1.4.2/docs/auparse_init.3 audit-1.5.1/docs/auparse_init.3 --- audit-1.4.2/docs/auparse_init.3 2007-02-16 15:17:38.000000000 -0500 +++ audit-1.5.1/docs/auparse_init.3 2007-03-02 16:29:06.000000000 -0500 @@ -17,6 +17,7 @@ auparse_init initializes an instance of AUSOURCE_BUFFER - use a buffer AUSOURCE_BUFFER_ARRAY - use an array of buffers AUSOURCE_DESCRIPTOR - use a particular descriptor + AUSOURCE_FILE_POINTER - use a stdio FILE pointer .fi The pointer 'b' is used to set the file name, array of filenames, the buffer address, or an array of pointers to buffers, or the descriptor number based on what source is given. When the data source is an array of files or buffers, you would create an array of pointers with the last one being a NULL pointer. Buffers should be NUL terminated. diff -urp audit-1.4.2/init.d/auditd.init audit-1.5.1/init.d/auditd.init --- audit-1.4.2/init.d/auditd.init 2007-02-16 09:22:34.000000000 -0500 +++ audit-1.5.1/init.d/auditd.init 2007-03-02 17:02:13.000000000 -0500 @@ -21,12 +21,20 @@ # 7 - program is not running PATH=/sbin:/bin:/usr/bin:/usr/sbin +prog="auditd" +RETVAL=0 # Source function library. . /etc/init.d/functions +# Allow anyone to run status +if [ "$1" = "status" ] ; then + status $prog + exit $RETVAL +fi + # Check that we are root ... so non-root users stop here -test $EUID = 0 || exit 4 +test $EUID = 0 || exit 4 # Check config test -f /etc/sysconfig/auditd && . /etc/sysconfig/auditd @@ -34,9 +42,6 @@ test -f /etc/sysconfig/auditd && . /etc/ test -x /sbin/auditd || exit 5 test -f /etc/audit/auditd.conf || exit 6 -RETVAL=0 - -prog="auditd" start(){ echo -n $"Starting $prog: " @@ -114,9 +119,6 @@ case "$1" in stop) stop ;; - status) - status $prog - ;; restart) restart ;; diff -urp audit-1.4.2/src/auditd-config.c audit-1.5.1/src/auditd-config.c --- audit-1.4.2/src/auditd-config.c 2007-02-20 17:44:20.000000000 -0500 +++ audit-1.5.1/src/auditd-config.c 2007-02-28 17:35:15.000000000 -0500 @@ -1,5 +1,5 @@ /* auditd-config.c -- - * Copyright 2004-2006 Red Hat Inc., Durham, North Carolina. + * Copyright 2004-2007 Red Hat Inc., Durham, North Carolina. * All Rights Reserved. * * This program is free software; you can redistribute it and/or modify @@ -41,13 +41,15 @@ struct nv_pair { const char *name; - char *value; + const char *value; + const char *option; }; struct kw_pair { const char *name; - int (*parser)(const char *, int, struct daemon_conf *); + int (*parser)(struct nv_pair *, int, struct daemon_conf *); + int options; }; struct nv_list @@ -59,58 +61,61 @@ struct nv_list static char *get_line(FILE *f, char *buf); static int nv_split(char *buf, struct nv_pair *nv); static const struct kw_pair *kw_lookup(const char *val); -static int log_file_parser(const char *val, int line, +static int log_file_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int num_logs_parser(const char *val, int line, +static int num_logs_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int qos_parser(const char *val, int line, +static int qos_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int dispatch_parser(const char *val, int line, +static int dispatch_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int max_log_size_parser(const char *val, int line, +static int max_log_size_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int max_log_size_action_parser(const char *val, int line, +static int max_log_size_action_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int log_format_parser(const char *val, int line, +static int log_format_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int flush_parser(const char *val, int line, struct daemon_conf *config); -static int freq_parser(const char *val, int line, struct daemon_conf *config); -static int space_left_parser(const char *val, int line, +static int flush_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int space_action_parser(const char *val, int line, +static int freq_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int action_mail_acct_parser(const char *val, int line, +static int space_left_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int admin_space_left_parser(const char *val, int line, +static int space_action_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int admin_space_left_action_parser(const char *val, int line, +static int action_mail_acct_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int disk_full_action_parser(const char *val, int line, +static int admin_space_left_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int disk_error_action_parser(const char *val, int line, +static int admin_space_left_action_parser(struct nv_pair *nv, int line, + struct daemon_conf *config); +static int disk_full_action_parser(struct nv_pair *nv, int line, + struct daemon_conf *config); +static int disk_error_action_parser(struct nv_pair *nv, int line, + struct daemon_conf *config); +static int priority_boost_parser(struct nv_pair *nv, int line, struct daemon_conf *config); -static int priority_boost_parser(const char *val, int line, struct daemon_conf *config); static int sanity_check(struct daemon_conf *config); static const struct kw_pair keywords[] = { - {"log_file", log_file_parser }, - {"log_format", log_format_parser }, - {"flush", flush_parser }, - {"freq", freq_parser }, - {"num_logs", num_logs_parser }, - {"dispatcher", dispatch_parser }, - {"disp_qos", qos_parser }, - {"max_log_file", max_log_size_parser }, - {"max_log_file_action", max_log_size_action_parser }, - {"space_left", space_left_parser }, - {"space_left_action", space_action_parser }, - {"action_mail_acct", action_mail_acct_parser }, - {"admin_space_left", admin_space_left_parser }, - {"admin_space_left_action", admin_space_left_action_parser }, - {"disk_full_action", disk_full_action_parser }, - {"disk_error_action", disk_error_action_parser }, - {"priority_boost", priority_boost_parser }, + {"log_file", log_file_parser, 0 }, + {"log_format", log_format_parser, 0 }, + {"flush", flush_parser, 0 }, + {"freq", freq_parser, 0 }, + {"num_logs", num_logs_parser, 0 }, + {"dispatcher", dispatch_parser, 0 }, + {"disp_qos", qos_parser, 0 }, + {"max_log_file", max_log_size_parser, 0 }, + {"max_log_file_action", max_log_size_action_parser, 0 }, + {"space_left", space_left_parser, 0 }, + {"space_left_action", space_action_parser, 1 }, + {"action_mail_acct", action_mail_acct_parser, 0 }, + {"admin_space_left", admin_space_left_parser, 0 }, + {"admin_space_left_action", admin_space_left_action_parser, 1 }, + {"disk_full_action", disk_full_action_parser, 1 }, + {"disk_error_action", disk_error_action_parser, 1 }, + {"priority_boost", priority_boost_parser, 0 }, { NULL, NULL } }; @@ -312,7 +317,7 @@ int load_config(struct daemon_conf *conf } /* dispatch to keyword's local parser */ - rc = kw->parser(nv.value, lineno, config); + rc = kw->parser(&nv, lineno, config); if (rc != 0) { fclose(f); return 1; // local parser puts message out @@ -346,6 +351,7 @@ static int nv_split(char *buf, struct nv nv->name = NULL; nv->value = NULL; + nv->option = NULL; ptr = strtok(buf, " "); if (ptr == NULL) return 0; /* If there's nothing, go to next line */ @@ -366,14 +372,15 @@ static int nv_split(char *buf, struct nv return 1; nv->value = ptr; - /* Make sure there's nothing else */ + /* See if there's an option */ ptr = strtok(NULL, " "); if (ptr) { - if (strncasecmp(nv->value, "exec", 4) == 0) { - nv->value[4] = ' '; - return 0; - } - return 1; + nv->option = ptr; + + /* Make sure there's nothing else */ + ptr = strtok(NULL, " "); + if (ptr) + return 1; } /* Everything is OK */ @@ -391,17 +398,18 @@ static const struct kw_pair *kw_lookup(c return &keywords[i]; } -static int log_file_parser(const char *val, int line,struct daemon_conf *config) +static int log_file_parser(struct nv_pair *nv, int line, + struct daemon_conf *config) { char *dir = NULL, *tdir, *base; DIR *d; int fd, mode; struct stat buf; - audit_msg(LOG_DEBUG, "log_file_parser called with: %s", val); + audit_msg(LOG_DEBUG, "log_file_parser called with: %s", nv->value); /* split name into dir and basename. */ - tdir = strdup(val); + tdir = strdup(nv->value); if (tdir) dir = dirname(tdir); if (dir == NULL || strlen(dir) < 4) { // '/var' is shortest dirname @@ -412,7 +420,7 @@ static int log_file_parser(const char *v return 1; } - base = basename((char *)val); + base = basename((char *)nv->value); if (base == 0 || strlen(base) == 0) { audit_msg(LOG_ERR, "The file name: %s is too short - line %d", base, line); @@ -438,66 +446,66 @@ static int log_file_parser(const char *v else mode = O_RDONLY; - fd = open(val, mode); + fd = open(nv->value, mode); if (fd < 0) { if (errno == ENOENT) { - fd = create_log_file(val); + fd = create_log_file(nv->value); if (fd < 0) return 1; } else { - audit_msg(LOG_ERR, "Unable to open %s (%s)", val, + audit_msg(LOG_ERR, "Unable to open %s (%s)", nv->value, strerror(errno)); return 1; } } if (fstat(fd, &buf) < 0) { audit_msg(LOG_ERR, "Unable to stat %s (%s)", - val, strerror(errno)); + nv->value, strerror(errno)); close(fd); return 1; } close(fd); if (!S_ISREG(buf.st_mode)) { - audit_msg(LOG_ERR, "%s is not a regular file", val); + audit_msg(LOG_ERR, "%s is not a regular file", nv->value); return 1; } if (buf.st_uid != 0) { - audit_msg(LOG_ERR, "%s is not owned by root", val); + audit_msg(LOG_ERR, "%s is not owned by root", nv->value); return 1; } if ((buf.st_mode & (S_IRUSR|S_IWUSR|S_IRGRP)) != (S_IRUSR|S_IWUSR|S_IRGRP)) { - audit_msg(LOG_ERR, "%s permissions should be 0640", val); + audit_msg(LOG_ERR, "%s permissions should be 0640", nv->value); return 1; } free((void *)config->log_file); - config->log_file = strdup(val); + config->log_file = strdup(nv->value); if (config->log_file == NULL) return 1; return 0; } -static int num_logs_parser(const char *val, int line, +static int num_logs_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { - const char *ptr = val; + const char *ptr = nv->value; unsigned long i; - audit_msg(LOG_DEBUG, "num_logs_parser called with: %s", val); + audit_msg(LOG_DEBUG, "num_logs_parser called with: %s", nv->value); /* check that all chars are numbers */ for (i=0; ptr[i]; i++) { if (!isdigit(ptr[i])) { audit_msg(LOG_ERR, "Value %s should only be numbers - line %d", - val, line); + nv->value, line); return 1; } } /* convert to unsigned long */ errno = 0; - i = strtoul(val, NULL, 10); + i = strtoul(nv->value, NULL, 10); if (errno) { audit_msg(LOG_ERR, "Error converting string to a number (%s) - line %d", @@ -512,36 +520,37 @@ static int num_logs_parser(const char *v return 0; } -static int qos_parser(const char *val, int line, +static int qos_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { int i; - audit_msg(LOG_DEBUG, "qos_parser called with: %s", val); + audit_msg(LOG_DEBUG, "qos_parser called with: %s", nv->value); for (i=0; qos_options[i].name != NULL; i++) { - if (strcasecmp(val, qos_options[i].name) == 0) { + if (strcasecmp(nv->value, qos_options[i].name) == 0) { config->qos = qos_options[i].option; return 0; } } - audit_msg(LOG_ERR, "Option %s not found - line %d", val, line); + audit_msg(LOG_ERR, "Option %s not found - line %d", nv->value, line); return 1; } -static int dispatch_parser(const char *val, int line,struct daemon_conf *config) +static int dispatch_parser(struct nv_pair *nv, int line, + struct daemon_conf *config) { char *dir = NULL, *tdir, *base; int fd; struct stat buf; - audit_msg(LOG_DEBUG, "dispatch_parser called with: %s", val); - if (val == NULL) { + audit_msg(LOG_DEBUG, "dispatch_parser called with: %s", nv->value); + if (nv->value == NULL) { config->dispatcher = NULL; return 0; } /* split name into dir and basename. */ - tdir = strdup(val); + tdir = strdup(nv->value); if (tdir) dir = dirname(tdir); if (dir == NULL || strlen(dir) < 4) { // '/var' is shortest dirname @@ -553,7 +562,7 @@ static int dispatch_parser(const char *v } free((void *)tdir); - base = basename((char *)val); + base = basename((char *)nv->value); if (base == 0 || strlen(base) == 0) { audit_msg(LOG_ERR, "The file name: %s is too short - line %d", base, line); @@ -561,60 +570,60 @@ static int dispatch_parser(const char *v } /* if the file exists, see that its regular, owned by root, * and not world anything */ - fd = open(val, O_RDONLY); + fd = open(nv->value, O_RDONLY); if (fd < 0) { - audit_msg(LOG_ERR, "Unable to open %s (%s)", val, + audit_msg(LOG_ERR, "Unable to open %s (%s)", nv->value, strerror(errno)); return 1; } if (fstat(fd, &buf) < 0) { - audit_msg(LOG_ERR, "Unable to stat %s (%s)", val, + audit_msg(LOG_ERR, "Unable to stat %s (%s)", nv->value, strerror(errno)); close(fd); return 1; } close(fd); if (!S_ISREG(buf.st_mode)) { - audit_msg(LOG_ERR, "%s is not a regular file", val); + audit_msg(LOG_ERR, "%s is not a regular file", nv->value); return 1; } if (buf.st_uid != 0) { - audit_msg(LOG_ERR, "%s is not owned by root", val); + audit_msg(LOG_ERR, "%s is not owned by root", nv->value); return 1; } if ((buf.st_mode & (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP)) != (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP)) { - audit_msg(LOG_ERR, "%s permissions should be 0750", val); + audit_msg(LOG_ERR, "%s permissions should be 0750", nv->value); return 1; } free((void *)config->dispatcher); - config->dispatcher = strdup(val); + config->dispatcher = strdup(nv->value); if (config->dispatcher == NULL) return 1; return 0; } -static int max_log_size_parser(const char *val, int line, +static int max_log_size_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { - const char *ptr = val; + const char *ptr = nv->value; unsigned long i; - audit_msg(LOG_DEBUG, "max_log_size_parser called with: %s", val); + audit_msg(LOG_DEBUG, "max_log_size_parser called with: %s", nv->value); /* check that all chars are numbers */ for (i=0; ptr[i]; i++) { if (!isdigit(ptr[i])) { audit_msg(LOG_ERR, "Value %s should only be numbers - line %d", - val, line); + nv->value, line); return 1; } } /* convert to unsigned long */ errno = 0; - i = strtoul(val, NULL, 10); + i = strtoul(nv->value, NULL, 10); if (errno) { audit_msg(LOG_ERR, "Error converting string to a number (%s) - line %d", @@ -625,73 +634,76 @@ static int max_log_size_parser(const cha return 0; } -static int max_log_size_action_parser(const char *val, int line, +static int max_log_size_action_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { int i; - audit_msg(LOG_DEBUG, "max_log_size_action_parser called with: %s", val); + audit_msg(LOG_DEBUG, "max_log_size_action_parser called with: %s", + nv->value); for (i=0; size_actions[i].name != NULL; i++) { - if (strcasecmp(val, size_actions[i].name) == 0) { + if (strcasecmp(nv->value, size_actions[i].name) == 0) { config->max_log_size_action = size_actions[i].option; return 0; } } - audit_msg(LOG_ERR, "Option %s not found - line %d", val, line); + audit_msg(LOG_ERR, "Option %s not found - line %d", nv->value, line); return 1; } -static int log_format_parser(const char *val, int line, +static int log_format_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { int i; - audit_msg(LOG_DEBUG, "log_format_parser called with: %s", val); + audit_msg(LOG_DEBUG, "log_format_parser called with: %s", nv->value); for (i=0; log_formats[i].name != NULL; i++) { - if (strcasecmp(val, log_formats[i].name) == 0) { + if (strcasecmp(nv->value, log_formats[i].name) == 0) { config->log_format = log_formats[i].option; return 0; } } - audit_msg(LOG_ERR, "Option %s not found - line %d", val, line); + audit_msg(LOG_ERR, "Option %s not found - line %d", nv->value, line); return 1; } -static int flush_parser(const char *val, int line, struct daemon_conf *config) +static int flush_parser(struct nv_pair *nv, int line, + struct daemon_conf *config) { int i; - audit_msg(LOG_DEBUG, "flush_parser called with: %s", val); + audit_msg(LOG_DEBUG, "flush_parser called with: %s", nv->value); for (i=0; flush_techniques[i].name != NULL; i++) { - if (strcasecmp(val, flush_techniques[i].name) == 0) { + if (strcasecmp(nv->value, flush_techniques[i].name) == 0) { config->flush = flush_techniques[i].option; return 0; } } - audit_msg(LOG_ERR, "Option %s not found - line %d", val, line); + audit_msg(LOG_ERR, "Option %s not found - line %d", nv->value, line); return 1; } -static int freq_parser(const char *val, int line, struct daemon_conf *config) +static int freq_parser(struct nv_pair *nv, int line, + struct daemon_conf *config) { - const char *ptr = val; + const char *ptr = nv->value; int i; - audit_msg(LOG_DEBUG, "freq_parser called with: %s", val); + audit_msg(LOG_DEBUG, "freq_parser called with: %s", nv->value); /* check that all chars are numbers */ for (i=0; ptr[i]; i++) { if (!isdigit(ptr[i])) { audit_msg(LOG_ERR, "Value %s should only be numbers - line %d", - val, line); + nv->value, line); return 1; } } /* convert to unsigned int */ errno = 0; - i = strtoul(val, NULL, 10); + i = strtoul(nv->value, NULL, 10); if (errno) { audit_msg(LOG_ERR, "Error converting string to a number (%s) - line %d", @@ -702,34 +714,34 @@ static int freq_parser(const char *val, if (i > INT_MAX) { audit_msg(LOG_ERR, "Error - converted number (%s) is too large - line %d", - val, line); + nv->value, line); return 1; } config->freq = (unsigned int)i; return 0; } -static int space_left_parser(const char *val, int line, +static int space_left_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { - const char *ptr = val; + const char *ptr = nv->value; unsigned long i; - audit_msg(LOG_DEBUG, "space_left_parser called with: %s", val); + audit_msg(LOG_DEBUG, "space_left_parser called with: %s", nv->value); /* check that all chars are numbers */ for (i=0; ptr[i]; i++) { if (!isdigit(ptr[i])) { audit_msg(LOG_ERR, "Value %s should only be numbers - line %d", - val, line); + nv->value, line); return 1; } } /* convert to unsigned long */ errno = 0; - i = strtoul(val, NULL, 10); + i = strtoul(nv->value, NULL, 10); if (errno) { audit_msg(LOG_ERR, "Error converting string to a number (%s) - line %d", @@ -740,57 +752,44 @@ static int space_left_parser(const char return 0; } -static const char *extract_exe_name(const char *val) +static int check_exe_name(const char *val) { - int fd; struct stat buf; - const char *p = val; - // Eat leading whitespace - while (isspace(*p)) - p++; - if (*p != '/') { - audit_msg(LOG_ERR, "Absolute path needed for %s", p); - return NULL; + if (*val != '/') { + audit_msg(LOG_ERR, "Absolute path needed for %s", val); + return -1; } - fd = open(p, O_RDONLY); - if (fd < 0) { - audit_msg(LOG_ERR, "Unable to open %s (%s)", p, - strerror(errno)); - return NULL; - } - if (fstat(fd, &buf) < 0) { - audit_msg(LOG_ERR, "Unable to stat %s (%s)", p, + if (stat(val, &buf) < 0) { + audit_msg(LOG_ERR, "Unable to stat %s (%s)", val, strerror(errno)); - close(fd); - return NULL; + return -1; } - close(fd); if (!S_ISREG(buf.st_mode)) { - audit_msg(LOG_ERR, "%s is not a regular file", p); - return NULL; + audit_msg(LOG_ERR, "%s is not a regular file", val); + return -1; } if (buf.st_uid != 0) { - audit_msg(LOG_ERR, "%s is not owned by root", p); - return NULL; + audit_msg(LOG_ERR, "%s is not owned by root", val); + return -1; } if ((buf.st_mode & (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP)) != (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP)) { - audit_msg(LOG_ERR, "%s permissions should be 0750", p); - return NULL; + audit_msg(LOG_ERR, "%s permissions should be 0750", val); + return -1; } - return strdup(p); + return 0; } -static int space_action_parser(const char *val, int line, +static int space_action_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { int i; - audit_msg(LOG_DEBUG, "space_action_parser called with: %s", val); + audit_msg(LOG_DEBUG, "space_action_parser called with: %s", nv->value); for (i=0; failure_actions[i].name != NULL; i++) { - if (strcasecmp(val, failure_actions[i].name) == 0) { + if (strcasecmp(nv->value, failure_actions[i].name) == 0) { if (failure_actions[i].option == FA_EMAIL) { if (access(email_command, X_OK)) { audit_msg(LOG_ERR, @@ -801,17 +800,17 @@ static int space_action_parser(const cha config->space_left_action = failure_actions[i].option; return 0; } else if (i == FA_EXEC) { - if (strncasecmp(failure_actions[i].name, val, 4) == 0){ - const char *e = extract_exe_name(&val[4]); - if (e == NULL) + if (strncasecmp(failure_actions[i].name, + nv->value, 4) == 0){ + if (check_exe_name(nv->option)) return 1; - config->space_left_exe = e; + config->space_left_exe = strdup(nv->option); config->space_left_action = FA_EXEC; return 0; } } } - audit_msg(LOG_ERR, "Option %s not found - line %d", val, line); + audit_msg(LOG_ERR, "Option %s not found - line %d", nv->value, line); return 1; } @@ -856,13 +855,14 @@ int validate_email(const char *acct) return 0; } -static int action_mail_acct_parser(const char *val, int line, +static int action_mail_acct_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { char *tmail; - audit_msg(LOG_DEBUG, "action_mail_acct_parser called with: %s", val); - tmail = strdup(val); + audit_msg(LOG_DEBUG, "action_mail_acct_parser called with: %s", + nv->value); + tmail = strdup(nv->value); if (tmail == NULL) return 1; @@ -878,27 +878,28 @@ static int action_mail_acct_parser(const return 0; } -static int admin_space_left_parser(const char *val, int line, +static int admin_space_left_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { - const char *ptr = val; + const char *ptr = nv->value; unsigned long i; - audit_msg(LOG_DEBUG, "admin_space_left_parser called with: %s", val); + audit_msg(LOG_DEBUG, "admin_space_left_parser called with: %s", + nv->value); /* check that all chars are numbers */ for (i=0; ptr[i]; i++) { if (!isdigit(ptr[i])) { audit_msg(LOG_ERR, "Value %s should only be numbers - line %d", - val, line); + nv->value, line); return 1; } } /* convert to unsigned long */ errno = 0; - i = strtoul(val, NULL, 10); + i = strtoul(nv->value, NULL, 10); if (errno) { audit_msg(LOG_ERR, "Error converting string to a number (%s) - line %d", @@ -909,14 +910,15 @@ static int admin_space_left_parser(const return 0; } -static int admin_space_left_action_parser(const char *val, int line, +static int admin_space_left_action_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { int i; - audit_msg(LOG_DEBUG, "admin_space_left_action_parser called with: %s", val); + audit_msg(LOG_DEBUG, "admin_space_left_action_parser called with: %s", + nv->value); for (i=0; failure_actions[i].name != NULL; i++) { - if (strcasecmp(val, failure_actions[i].name) == 0) { + if (strcasecmp(nv->value, failure_actions[i].name) == 0) { if (failure_actions[i].option == FA_EMAIL) { if (access(email_command, X_OK)) { audit_msg(LOG_ERR, @@ -928,28 +930,30 @@ static int admin_space_left_action_parse failure_actions[i].option; return 0; } else if (i == FA_EXEC) { - if (strncasecmp(failure_actions[i].name, val, 4) == 0){ - const char *e = extract_exe_name(&val[4]); - if (e == NULL) + if (strncasecmp(failure_actions[i].name, + nv->value, 4) == 0){ + if (check_exe_name(nv->option)) return 1; - config->admin_space_left_exe = e; + config->admin_space_left_exe = + strdup(nv->option); config->admin_space_left_action = FA_EXEC; return 0; } } } - audit_msg(LOG_ERR, "Option %s not found - line %d", val, line); + audit_msg(LOG_ERR, "Option %s not found - line %d", nv->value, line); return 1; } -static int disk_full_action_parser(const char *val, int line, +static int disk_full_action_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { int i; - audit_msg(LOG_DEBUG, "disk_full_action_parser called with: %s", val); + audit_msg(LOG_DEBUG, "disk_full_action_parser called with: %s", + nv->value); for (i=0; failure_actions[i].name != NULL; i++) { - if (strcasecmp(val, failure_actions[i].name) == 0) { + if (strcasecmp(nv->value, failure_actions[i].name) == 0) { if (failure_actions[i].option != FA_EMAIL) { config->disk_full_action = failure_actions[i].option; @@ -957,32 +961,33 @@ static int disk_full_action_parser(const } else { audit_msg(LOG_ERR, "Illegal option %s for disk_full_action - line %d", - val, line); + nv->value, line); return 1; } } else if (i == FA_EXEC) { - if (strncasecmp(failure_actions[i].name, val, 4) == 0){ - const char *e = extract_exe_name(&val[4]); - if (e == NULL) + if (strncasecmp(failure_actions[i].name, + nv->value, 4) == 0){ + if (check_exe_name(nv->option)) return 1; - config->disk_full_exe = e; + config->disk_full_exe = strdup(nv->option); config->disk_full_action = FA_EXEC; return 0; } } } - audit_msg(LOG_ERR, "Option %s not found - line %d", val, line); + audit_msg(LOG_ERR, "Option %s not found - line %d", nv->value, line); return 1; } -static int disk_error_action_parser(const char *val, int line, +static int disk_error_action_parser(struct nv_pair *nv, int line, struct daemon_conf *config) { int i; - audit_msg(LOG_DEBUG, "disk_error_action_parser called with: %s", val); + audit_msg(LOG_DEBUG, "disk_error_action_parser called with: %s", + nv->value); for (i=0; failure_actions[i].name != NULL; i++) { - if (strcasecmp(val, failure_actions[i].name) == 0) { + if (strcasecmp(nv->value, failure_actions[i].name) == 0) { if (failure_actions[i].option != FA_EMAIL) { config->disk_error_action = failure_actions[i].option; @@ -990,44 +995,46 @@ static int disk_error_action_parser(cons } else { audit_msg(LOG_ERR, "Illegal option %s for disk_error_action - line %d", - val, line); + nv->value, line); return 1; } } else if (i == FA_EXEC) { - if (strncasecmp(failure_actions[i].name, val, 4) == 0){ - const char *e = extract_exe_name(&val[4]); - if (e == NULL) + if (strncasecmp(failure_actions[i].name, + nv->value, 4) == 0){ + if (check_exe_name(nv->option)) return 1; - config->disk_error_exe = e; + config->disk_error_exe = strdup(nv->option); config->disk_error_action = FA_EXEC; return 0; } } } - audit_msg(LOG_ERR, "Option %s not found - line %d", val, line); + audit_msg(LOG_ERR, "Option %s not found - line %d", nv->value, line); return 1; } -static int priority_boost_parser(const char *val, int line, struct daemon_conf *config) +static int priority_boost_parser(struct nv_pair *nv, int line, + struct daemon_conf *config) { - const char *ptr = val; + const char *ptr = nv->value; int i; - audit_msg(LOG_DEBUG, "priority_boost_parser called with: %s", val); + audit_msg(LOG_DEBUG, "priority_boost_parser called with: %s", + nv->value); /* check that all chars are numbers */ for (i=0; ptr[i]; i++) { if (!isdigit(ptr[i])) { audit_msg(LOG_ERR, "Value %s should only be numbers - line %d", - val, line); + nv->value, line); return 1; } } /* convert to unsigned int */ errno = 0; - i = strtoul(val, NULL, 10); + i = strtoul(nv->value, NULL, 10); if (errno) { audit_msg(LOG_ERR, "Error converting string to a number (%s) - line %d", @@ -1038,7 +1045,7 @@ static int priority_boost_parser(const c if (i > INT_MAX) { audit_msg(LOG_ERR, "Error - converted number (%s) is too large - line %d", - val, line); + nv->value, line); return 1; } config->priority_boost = (unsigned int)i; diff -urpN audit-1.4.2/contrib/nispom.rules audit-1.5.1/contrib/nispom.rules --- audit-1.4.2/contrib/nispom.rules 1969-12-31 19:00:00.000000000 -0500 +++ audit-1.5.1/contrib/nispom.rules 2007-03-01 14:05:25.000000000 -0500 @@ -0,0 +1,91 @@ +## +## This file contains the a sample audit configuration intended to +## meet the NISPOM Chapter 8 rules. +## +## This file should be saved as /etc/audit/audit.rules. +## + +## Remove any existing rules +-D + +## Increase buffer size to handle the increased number of messages. +## Feel free to increase this if the machine panic's +-b 8192 + +## Audit 1, 1(a) Enough information to determine the date and time of +## action (e.g., common network time), the system locale of the action, +## the system entity that initiated or completed the action, the resources +## involved, and the action involved. + +## Things that could affect time +-a entry,always -S adjtimex -S settimeofday -k time-change +-w /etc/localtime -p wa -k time-change + +## Things that could affect system locale +-a exit,always -S sethostname -k system-locale +-w /etc/issue -p wa -k system-locale +-w /etc/issue.net -p wa -k system-locale +-w /etc/hosts -p wa -k system-locale +-w /etc/sysconfig/network -p wa -k system-locale + +## Audit 1, 1(b) Successful and unsuccessful logons and logoffs. +## This is covered by patches to login, gdm, and openssh +## Might also want to watch these files if needing extra information +#-w /var/log/faillog -p wa -k logins +#-w /var/log/lastlog -p wa -k logins + +## Audit 1, 1(c) Successful and unsuccessful accesses to +## security-relevant objects and directories, including +## creation, open, close, modification, and deletion. + +## unsuccessful creation +-a exit,always -S creat -S mkdir -S mknod -S link -S symlink -F exit=-13 -k creation +-a exit,always -S mkdirat -S mknodat -S linkat -S symlinkat -F exit=-13 -k creation + +## unsuccessful open +-a exit,always -S open -F exit=-13 -k open + +## unsuccessful close +-a exit,always -S close -F exit=-13 -k close + +## unsuccessful modifications +-a exit,always -S rename -S truncate -S ftruncate -F exit=-13 -k mods +-a exit,always -S renameat -F exit=-13 -k mods +-a exit,always -F perm=a -F exit=-13 -k mods + +## unsuccessful deletion +-a exit,always -S rmdir -S unlink -F exit=-13 -k delete +-a exit,always -S unlinkat -F exit=-13 -k delete + +## Audit 1, 1(d) Changes in user authenticators. +## Covered by patches to libpam, passwd, and shadow-utils +## Might also want to watch these files for changes +-w /etc/group -p wa -k auth +-w /etc/passwd -p wa -k auth +-w /etc/gshadow -p wa -k auth +-w /etc/shadow -p wa -k auth +-w /etc/security/opasswd -p wa -k auth + +## Audit 1, 1(e) The blocking or blacklisting of a user ID, +## terminal, or access port and the reason for the action. +## Covered by patches to pam_tally + +## Audit 1, 1(f) Denial of access resulting from an excessive +## number of unsuccessful logon attempts. +## Covered by patches to pam_tally + +## Audit 1, 2 Audit Trail Protection. The contents of audit trails +## shall be protected against unauthorized access, modification, +## or deletion. +## This should be covered by file permissions, but we can watch it +## to see any activity +-w /var/log/audit/ -k audit-logs +-w /var/log/audit/audit.log -k audit-logs +#-w /var/log/audit/audit.log.1 -k audit-logs +#-w /var/log/audit/audit.log.2 -k audit-logs +#-w /var/log/audit/audit.log.3 -k audit-logs +#-w /var/log/audit/audit.log.4 -k audit-logs + +## Put your own watches after this point +# -w /your-file -p rwxa -k mykey + Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/FC-6/audit.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- audit.spec 21 Feb 2007 22:54:58 -0000 1.121 +++ audit.spec 3 Mar 2007 15:24:33 -0000 1.122 @@ -1,12 +1,13 @@ Summary: User space tools for 2.6 kernel auditing Name: audit Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ Source0: %{name}-%{version}.tar.gz Patch1: audit-1.4.2-auparse.patch +Patch2: audit-1.5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool swig python-devel BuildRequires: kernel-headers >= 2.6.18 @@ -57,6 +58,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build autoreconf -fv --install @@ -176,6 +178,13 @@ %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd %changelog +* Sat Mar 03 2007 Steve Grubb 1.4.2-3 +- Added NISPOM sample rules +- Verify accessibility of files passed in auparse_init +- Fix bug in parser library interpreting socketcalls +- Add support for stdio FILE pointer in auparse_init +- Adjust init script to allow anyone to status auditd (#230626) + * Wed Feb 21 2007 Steve Grubb 1.4.2-2 - Fix hidden function in auparse library From fedora-cvs-commits at redhat.com Sat Mar 3 15:25:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 3 Mar 2007 10:25:47 -0500 Subject: rpms/audit/FC-6 audit.spec,1.122,1.123 Message-ID: <200703031525.l23FPlee008884@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8703 Modified Files: audit.spec Log Message: add nispom.rules to specfile Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/FC-6/audit.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- audit.spec 3 Mar 2007 15:24:33 -0000 1.122 +++ audit.spec 3 Mar 2007 15:25:45 -0000 1.123 @@ -162,7 +162,7 @@ %files %defattr(-,root,root,-) -%doc README COPYING ChangeLog sample.rules contrib/capp.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron +%doc README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron %attr(0644,root,root) %{_mandir}/man8/* %attr(750,root,root) /sbin/auditctl %attr(750,root,root) /sbin/auditd From fedora-cvs-commits at redhat.com Sat Mar 3 20:48:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 3 Mar 2007 15:48:45 -0500 Subject: rpms/ConsoleKit/devel ConsoleKit-0.1.3-allow-uid0.patch, NONE, 1.1 ConsoleKit.spec, 1.3, 1.4 Message-ID: <200703032048.l23Kmjuk007692@cvs.devel.redhat.com> Author: davidz Update of /cvs/dist/rpms/ConsoleKit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7527 Modified Files: ConsoleKit.spec Added Files: ConsoleKit-0.1.3-allow-uid0.patch Log Message: * Sat Mar 3 2007 David Zeuthen - 0.1.3-0.git20070301.1 - Allow caller to pass uid=0 in libck-connector ConsoleKit-0.1.3-allow-uid0.patch: ck-connector.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE ConsoleKit-0.1.3-allow-uid0.patch --- --- libck-connector/ck-connector.c.orig 2007-03-03 15:42:42.000000000 -0500 +++ libck-connector/ck-connector.c 2007-03-03 15:41:11.000000000 -0500 @@ -427,7 +427,6 @@ char *cookie; _ck_return_val_if_fail (connector != NULL, FALSE); - _ck_return_val_if_fail (user > 0, FALSE); _ck_return_val_if_fail (tty != NULL, FALSE); reply = NULL; Index: ConsoleKit.spec =================================================================== RCS file: /cvs/dist/rpms/ConsoleKit/devel/ConsoleKit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ConsoleKit.spec 1 Mar 2007 20:14:37 -0000 1.3 +++ ConsoleKit.spec 3 Mar 2007 20:48:42 -0000 1.4 @@ -5,13 +5,13 @@ Summary: System daemon for tracking users, sessions and seats Name: ConsoleKit Version: 0.1.3 -Release: 0.git20070301%{?dist} +Release: 0.git20070301.1%{?dist} License: GPL Group: System Environment/Libraries URL: http://consolekit.freedesktop.org Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.git20070301.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - +Patch1: ConsoleKit-0.1.3-allow-uid0.patch Requires: dbus >= %{dbus_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -49,6 +49,7 @@ %prep %setup -q +%patch1 -p0 %build %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module @@ -102,6 +103,9 @@ %changelog +* Sat Mar 3 2007 David Zeuthen - 0.1.3-0.git20070301.1 +- Allow caller to pass uid=0 in libck-connector + * Thu Mar 1 2007 David Zeuthen - 0.1.3-0.git20070301 - Update to git snapshot - Drop all patches as they are committed upstream From fedora-cvs-commits at redhat.com Sat Mar 3 20:50:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 3 Mar 2007 15:50:48 -0500 Subject: rpms/util-linux/devel util-linux-login.pamd, 1.1, 1.2 util-linux.spec, 1.151, 1.152 Message-ID: <200703032050.l23Kom2j009252@cvs.devel.redhat.com> Author: davidz Update of /cvs/dist/rpms/util-linux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9095 Modified Files: util-linux-login.pamd util-linux.spec Log Message: * Sat Mar 3 2007 David Zeuthen 2.13-0.50 - include ConsoleKit session module by default (#229172) Index: util-linux-login.pamd =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-login.pamd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- util-linux-login.pamd 21 Aug 2006 16:24:02 -0000 1.1 +++ util-linux-login.pamd 3 Mar 2007 20:50:41 -0000 1.2 @@ -12,3 +12,4 @@ # pam_selinux.so open should only be followed by sessions to be executed in the user context session required pam_selinux.so open session optional pam_keyinit.so force revoke +session optional pam_ck_connector.so Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- util-linux.spec 11 Jan 2007 15:39:41 -0000 1.151 +++ util-linux.spec 3 Mar 2007 20:50:41 -0000 1.152 @@ -9,7 +9,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.13 -Release: 0.49%{?dist} +Release: 0.50%{?dist} License: distributable Group: System Environment/Base @@ -73,6 +73,7 @@ %if %{include_raw} Requires: udev %endif +Requires: ConsoleKit-libs Provides: mount = %{version} Provides: losetup = %{version} @@ -756,6 +757,9 @@ /sbin/losetup %changelog +* Sat Mar 3 2007 David Zeuthen 2.13-0.50 +- include ConsoleKit session module by default (#229172) + * Thu Jan 11 2007 Karel Zak 2.13-0.49 - fix #222293 - undocumented partx,addpart, delpart From fedora-cvs-commits at redhat.com Sun Mar 4 12:56:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 4 Mar 2007 07:56:39 -0500 Subject: rpms/openoffice.org/devel .cvsignore, 1.122, 1.123 openoffice.org.spec, 1.1084, 1.1085 sources, 1.232, 1.233 Message-ID: <200703041256.l24CudaX009246@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9200 Modified Files: .cvsignore openoffice.org.spec sources Log Message: next sources Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- .cvsignore 27 Feb 2007 15:52:24 -0000 1.122 +++ .cvsignore 4 Mar 2007 12:56:36 -0000 1.123 @@ -199,3 +199,4 @@ OOF680_m6.tar.bz2 OOF680_m7.tar.bz2 unowinreg.dll +OOF680_m10.tar.bz2 Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1084 retrieving revision 1.1085 diff -u -r1.1084 -r1.1085 --- openoffice.org.spec 2 Mar 2007 13:15:21 -0000 1.1084 +++ openoffice.org.spec 4 Mar 2007 12:56:36 -0000 1.1085 @@ -1319,6 +1319,9 @@ cp -f %{PATCH0} $RPM_BUILD_ROOT/%{instdir}/program/crash_report chmod a+x $RPM_BUILD_ROOT/%{instdir}/program/crash_report +#preset the shared config file +sed -i -e 's#sd_binary"#sd_binary" -env:INIFILENAME=%{instdir}/program/sofficerc#g' $RPM_BUILD_ROOT/%{instdir}/program/soffice + #make up some /usr/bin scripts mkdir -p $RPM_BUILD_ROOT/%{_bindir} Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- sources 27 Feb 2007 15:52:24 -0000 1.232 +++ sources 4 Mar 2007 12:56:36 -0000 1.233 @@ -3,5 +3,5 @@ 1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz 05a906513ef89af5e189097fa0c50681 ooo64726.sdf 26c72b57608d21c7cccf941f1df2aea9 redhat-templates.tar.gz -777855191d14bab08853a769cb4fd418 OOF680_m9.tar.bz2 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll +e51956c196bfe34f12f1dc6d9e2d6b9f OOF680_m10.tar.bz2 From fedora-cvs-commits at redhat.com Sun Mar 4 12:58:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 4 Mar 2007 07:58:37 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1085, 1.1086 openoffice.org-2.2.0.ooo63159.sal.dtype.patch, 1.1, NONE Message-ID: <200703041258.l24Cwb7D010806@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10765 Modified Files: openoffice.org.spec Removed Files: openoffice.org-2.2.0.ooo63159.sal.dtype.patch Log Message: drop d_type, no perceptable difference Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1085 retrieving revision 1.1086 diff -u -r1.1085 -r1.1086 --- openoffice.org.spec 4 Mar 2007 12:56:36 -0000 1.1085 +++ openoffice.org.spec 4 Mar 2007 12:58:35 -0000 1.1086 @@ -1,6 +1,6 @@ %define oootag OOF680 -%define ooomilestone 9 -%define rh_rpm_release 2.0 +%define ooomilestone 10 +%define rh_rpm_release 1 # gcc#19664# %define stlvisibilityfcked 1 @@ -124,7 +124,6 @@ Patch67: workspace.sixtyfour11.patch Patch68: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch Patch69: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch -Patch70: openoffice.org-2.2.0.ooo63159.sal.dtype.patch %define instdir %{_libdir}/openoffice.org @@ -1041,7 +1040,6 @@ %patch67 -p1 -b .workspace.sixtyfour11.patch %patch68 -p1 -b .gccXXXXX.solenv.javaregistration.patch %patch69 -p1 -b .ooo68717.gstreamer.video.patch -%patch70 -p1 -b .ooo63159.sal.dtype.patch cp %{SOURCE1} extras/source/database/evolocal.odb @@ -2587,6 +2585,11 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Sun Mar 04 2007 Caolan McNamara - 1:2.2.0-10.1 +- next release candidate +- drop d_type patch, no perceptable difference in performance + http://people.redhat.com/caolanm/speed/d_type.ods + * Wed Mar 02 2007 Caolan McNamara - 1:2.2.0-9.2 - jumped the run on requiring extras from a core package, back out for now - -finline-limit=64 http://blogs.linux.ie/caolan/2007/03/02/finline-limit-and-ooo --- openoffice.org-2.2.0.ooo63159.sal.dtype.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 4 13:01:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 4 Mar 2007 08:01:48 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1086,1.1087 Message-ID: <200703041301.l24D1mR0012910@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12872 Modified Files: openoffice.org.spec Log Message: comparison build Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1086 retrieving revision 1.1087 diff -u -r1.1086 -r1.1087 --- openoffice.org.spec 4 Mar 2007 12:58:35 -0000 1.1086 +++ openoffice.org.spec 4 Mar 2007 13:01:41 -0000 1.1087 @@ -1,6 +1,6 @@ %define oootag OOF680 %define ooomilestone 10 -%define rh_rpm_release 1 +%define rh_rpm_release 1.0 # gcc#19664# %define stlvisibilityfcked 1 @@ -1070,7 +1070,7 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64" +export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics" #convert _smp_mflags to dmake equivalent SMP_MFLAGS=%{?_smp_mflags} SMP_MFLAGS=${SMP_MFLAGS/-j/-P} From fedora-cvs-commits at redhat.com Sun Mar 4 20:17:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 4 Mar 2007 15:17:41 -0500 Subject: rpms/kernel/FC-5 patch-2.6.19.5-6.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.431.2.2, 1.431.2.3 kernel-2.6.spec, 1.2288.2.2, 1.2288.2.3 sources, 1.371.2.2, 1.371.2.3 upstream, 1.335.2.2, 1.335.2.3 linux-2.6-19-bad_inode_ops.patch, 1.1.2.1, NONE linux-2.6-19-snd-hda-si3054-dont-return-error.patch, 1.1.2.1, NONE linux-2.6-19_20-swiotlb_sync_single_bug.patch, 1.1.2.1, NONE linux-2.6-19_20-usbnet_failure_path_oops.patch, 1.1.2.1, NONE linux-2.6-CIFS-null-terminator.patch, 1.1, NONE linux-2.6-NAPI-irqsave.patch, 1.1.2.1, NONE Message-ID: <200703042017.l24KHfa0016282@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv14407 Modified Files: Tag: kernel-2_6_19-1_2288_fc5_stable .cvsignore kernel-2.6.spec sources upstream Added Files: Tag: kernel-2_6_19-1_2288_fc5_stable patch-2.6.19.5-6.bz2.sign Removed Files: Tag: kernel-2_6_19-1_2288_fc5_stable linux-2.6-19-bad_inode_ops.patch linux-2.6-19-snd-hda-si3054-dont-return-error.patch linux-2.6-19_20-swiotlb_sync_single_bug.patch linux-2.6-19_20-usbnet_failure_path_oops.patch linux-2.6-CIFS-null-terminator.patch linux-2.6-NAPI-irqsave.patch Log Message: * Sun Mar 4 2007 Chuck Ebbert - 2.6.19.6 --- NEW FILE patch-2.6.19.5-6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF6N7yyGugalF9Dw4RAg+ZAKCJC1dixifSfdI/B4ceIxgfySBZVwCfYvPE 67v05CfdBcsngobHQR/E+ac= =lZPB -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v retrieving revision 1.431.2.2 retrieving revision 1.431.2.3 diff -u -r1.431.2.2 -r1.431.2.3 --- .cvsignore 2 Mar 2007 21:10:23 -0000 1.431.2.2 +++ .cvsignore 4 Mar 2007 20:17:38 -0000 1.431.2.3 @@ -7,3 +7,4 @@ patch-2.6.19.3.bz2 patch-2.6.19.3-4.bz2 patch-2.6.19.4-5.bz2 +patch-2.6.19.5-6.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2288.2.2 retrieving revision 1.2288.2.3 diff -u -r1.2288.2.2 -r1.2288.2.3 --- kernel-2.6.spec 2 Mar 2007 21:10:23 -0000 1.2288.2.2 +++ kernel-2.6.spec 4 Mar 2007 20:17:38 -0000 1.2288.2.3 @@ -313,6 +313,7 @@ Patch1: patch-2.6.19.3.bz2 Patch2: patch-2.6.19.3-4.bz2 Patch3: patch-2.6.19.4-5.bz2 +Patch4: patch-2.6.19.5-6.bz2 # Patches 10 through 99 are for things that are going upstream really soon. @@ -333,8 +334,6 @@ Patch206: linux-2.6-19_20-2_no_handler_for_vector.patch Patch207: linux-2.6-19_20-3_robust_apic_in_service_vector.patch -Patch210: linux-2.6-19_20-swiotlb_sync_single_bug.patch - # 300 - 399 ppc(64) Patch301: linux-2.6-cell-mambo-drivers.patch Patch302: linux-2.6-hvc-console.patch @@ -417,12 +416,10 @@ # core networking changes. # sound driver fixes -Patch1350: linux-2.6-19-snd-hda-si3054-dont-return-error.patch # Filesystem stuff. # Squashfs Patch1400: linux-2.6-squashfs.patch -Patch1403: linux-2.6-19-bad_inode_ops.patch # GFS/DLM Patch1411: linux-2.6-gfs2-tux.patch @@ -443,7 +440,6 @@ Patch1650: linux-2.6-serial-460800.patch Patch1681: linux-2.6-xfs-umount-fix.patch Patch1682: linux-2.6-xfs_attr2.patch -Patch1683: linux-2.6-CIFS-null-terminator.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 @@ -483,9 +479,7 @@ # Net driver fixes. Patch2500: linux-2.6-net-forcedeth-suspend.patch -Patch2501: linux-2.6-19_20-usbnet_failure_path_oops.patch Patch2503: linux-2.6-fedora-net_forcedeth_disable_msi.patch -Patch2504: linux-2.6-NAPI-irqsave.patch # 10000 to 20000 is for stuff that has to come last due to the # amount of drivers they touch. But only these should go here. @@ -827,6 +821,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -846,9 +841,6 @@ %patch206 -p1 %patch207 -p1 -# swiotlb sync fix -%patch210 -p1 - # add vidfail capability; # without this patch specifying a framebuffer on the kernel prompt would # make the boot stop if there's no supported framebuffer device; this is bad @@ -1001,14 +993,10 @@ # core networking changes. # sound driver fixes -# intel hda broken with si3054 codec -%patch1350 -p1 # Filesystem patches. # Squashfs %patch1400 -p1 -# bad_inode_ops security fix (CVE-2006-5753) -%patch1403 -p1 # GFS2/DLM #%patch1411 -p1 %patch1412 -p1 @@ -1034,8 +1022,6 @@ %patch1681 -p1 # Fix attr2 corruption with btree data extents %patch1682 -p1 -# Fix CIFS null termination bug -%patch1683 -p1 # Align kernel data segment to page boundary. %patch1690 -p1 # setuid /proc/self/maps fix. @@ -1095,13 +1081,8 @@ # Network driver fixes. # suspend/resume for forcedeth %patch2500 -p1 -# usbnet oops fix -%patch2501 -p1 # disable MSI on forcedeth cards %patch2503 -p1 -# net drivers: more NAPI fixes -%patch2504 -p1 - # # Patches 5000 to 6000 are reserved for new drivers that are about to @@ -1841,6 +1822,9 @@ %endif %changelog +* Sun Mar 4 2007 Chuck Ebbert +- 2.6.19.6 + * Fri Mar 2 2007 Chuck Ebbert - 2.6.19.5 - re-enable Xen Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v retrieving revision 1.371.2.2 retrieving revision 1.371.2.3 diff -u -r1.371.2.2 -r1.371.2.3 --- sources 2 Mar 2007 21:10:24 -0000 1.371.2.2 +++ sources 4 Mar 2007 20:17:38 -0000 1.371.2.3 @@ -3,3 +3,4 @@ ef8491f189893c250a61cea825de025c patch-2.6.19.3.bz2 32d58db1efaddc9af079c04a6409bc2e patch-2.6.19.3-4.bz2 349195718c3850c34e18c71004e1d4c7 patch-2.6.19.4-5.bz2 +ec8ce9fe712142bc97a79b6a9c82eafd patch-2.6.19.5-6.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v retrieving revision 1.335.2.2 retrieving revision 1.335.2.3 diff -u -r1.335.2.2 -r1.335.2.3 --- upstream 2 Mar 2007 21:10:24 -0000 1.335.2.2 +++ upstream 4 Mar 2007 20:17:38 -0000 1.335.2.3 @@ -2,3 +2,4 @@ patch-2.6.19.3.bz2 patch-2.6.19.3-4.bz2 patch-2.6.19.4-5.bz2 +patch-2.6.19.5-6.bz2 --- linux-2.6-19-bad_inode_ops.patch DELETED --- --- linux-2.6-19-snd-hda-si3054-dont-return-error.patch DELETED --- --- linux-2.6-19_20-swiotlb_sync_single_bug.patch DELETED --- --- linux-2.6-19_20-usbnet_failure_path_oops.patch DELETED --- --- linux-2.6-CIFS-null-terminator.patch DELETED --- --- linux-2.6-NAPI-irqsave.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 4 20:27:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 4 Mar 2007 15:27:24 -0500 Subject: rpms/kernel/FC-5 patch-2.6.19.6-7.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.431.2.3, 1.431.2.4 kernel-2.6.spec, 1.2288.2.3, 1.2288.2.4 sources, 1.371.2.3, 1.371.2.4 upstream, 1.335.2.3, 1.335.2.4 Message-ID: <200703042027.l24KRO46031925@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv31910 Modified Files: Tag: kernel-2_6_19-1_2288_fc5_stable .cvsignore kernel-2.6.spec sources upstream Added Files: Tag: kernel-2_6_19-1_2288_fc5_stable patch-2.6.19.6-7.bz2.sign Log Message: * Sun Mar 4 2007 Chuck Ebbert - 2.6.19.7 --- NEW FILE patch-2.6.19.6-7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF6Sv9yGugalF9Dw4RAuriAJ9FwGgpCCm5XX77GyRv5b1DJoCsAgCfSYp7 YWKBwlQXjlcjySjglvZE9Ig= =Rknr -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v retrieving revision 1.431.2.3 retrieving revision 1.431.2.4 diff -u -r1.431.2.3 -r1.431.2.4 --- .cvsignore 4 Mar 2007 20:17:38 -0000 1.431.2.3 +++ .cvsignore 4 Mar 2007 20:27:22 -0000 1.431.2.4 @@ -8,3 +8,4 @@ patch-2.6.19.3-4.bz2 patch-2.6.19.4-5.bz2 patch-2.6.19.5-6.bz2 +patch-2.6.19.6-7.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2288.2.3 retrieving revision 1.2288.2.4 diff -u -r1.2288.2.3 -r1.2288.2.4 --- kernel-2.6.spec 4 Mar 2007 20:17:38 -0000 1.2288.2.3 +++ kernel-2.6.spec 4 Mar 2007 20:27:22 -0000 1.2288.2.4 @@ -314,6 +314,7 @@ Patch2: patch-2.6.19.3-4.bz2 Patch3: patch-2.6.19.4-5.bz2 Patch4: patch-2.6.19.5-6.bz2 +Patch5: patch-2.6.19.6-7.bz2 # Patches 10 through 99 are for things that are going upstream really soon. @@ -822,6 +823,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -1823,6 +1825,9 @@ %changelog * Sun Mar 4 2007 Chuck Ebbert +- 2.6.19.7 + +* Sun Mar 4 2007 Chuck Ebbert - 2.6.19.6 * Fri Mar 2 2007 Chuck Ebbert Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v retrieving revision 1.371.2.3 retrieving revision 1.371.2.4 diff -u -r1.371.2.3 -r1.371.2.4 --- sources 4 Mar 2007 20:17:38 -0000 1.371.2.3 +++ sources 4 Mar 2007 20:27:22 -0000 1.371.2.4 @@ -4,3 +4,4 @@ 32d58db1efaddc9af079c04a6409bc2e patch-2.6.19.3-4.bz2 349195718c3850c34e18c71004e1d4c7 patch-2.6.19.4-5.bz2 ec8ce9fe712142bc97a79b6a9c82eafd patch-2.6.19.5-6.bz2 +20478d93a2b05d84d6cb340d3068f26a patch-2.6.19.6-7.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v retrieving revision 1.335.2.3 retrieving revision 1.335.2.4 diff -u -r1.335.2.3 -r1.335.2.4 --- upstream 4 Mar 2007 20:17:38 -0000 1.335.2.3 +++ upstream 4 Mar 2007 20:27:22 -0000 1.335.2.4 @@ -3,3 +3,4 @@ patch-2.6.19.3-4.bz2 patch-2.6.19.4-5.bz2 patch-2.6.19.5-6.bz2 +patch-2.6.19.6-7.bz2 From fedora-cvs-commits at redhat.com Sun Mar 4 20:34:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 4 Mar 2007 15:34:53 -0500 Subject: rpms/kernel/FC-6 patch-2.6.19.5-6.bz2.sign, NONE, 1.1.2.1 patch-2.6.19.6-7.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.550.6.3, 1.550.6.4 kernel-2.6.spec, 1.2911.6.4, 1.2911.6.5 sources, 1.514.6.2, 1.514.6.3 upstream, 1.435.6.2, 1.435.6.3 linux-2.6-19-bad_inode_ops.patch, 1.1.2.1, NONE linux-2.6-19-snd-hda-si3054-dont-return-error.patch, 1.1.2.1, NONE linux-2.6-19_20-swiotlb_sync_single_bug.patch, 1.1.2.1, NONE linux-2.6-19_20-usbnet_failure_path_oops.patch, 1.1.2.1, NONE linux-2.6-CIFS-null-terminator.patch, 1.1, NONE linux-2.6-NAPI-irqsave.patch, 1.1, NONE Message-ID: <200703042034.l24KYrBE015417@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15371 Modified Files: Tag: kernel-2_6_19-1_2911_fc6_stable .cvsignore kernel-2.6.spec sources upstream Added Files: Tag: kernel-2_6_19-1_2911_fc6_stable patch-2.6.19.5-6.bz2.sign patch-2.6.19.6-7.bz2.sign Removed Files: Tag: kernel-2_6_19-1_2911_fc6_stable linux-2.6-19-bad_inode_ops.patch linux-2.6-19-snd-hda-si3054-dont-return-error.patch linux-2.6-19_20-swiotlb_sync_single_bug.patch linux-2.6-19_20-usbnet_failure_path_oops.patch linux-2.6-CIFS-null-terminator.patch linux-2.6-NAPI-irqsave.patch Log Message: * Sun Mar 4 2007 Chuck Ebbert - 2.6.19.7 - 2.6.19.6 --- NEW FILE patch-2.6.19.5-6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF6N7yyGugalF9Dw4RAg+ZAKCJC1dixifSfdI/B4ceIxgfySBZVwCfYvPE 67v05CfdBcsngobHQR/E+ac= =lZPB -----END PGP SIGNATURE----- --- NEW FILE patch-2.6.19.6-7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF6Sv9yGugalF9Dw4RAuriAJ9FwGgpCCm5XX77GyRv5b1DJoCsAgCfSYp7 YWKBwlQXjlcjySjglvZE9Ig= =Rknr -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v retrieving revision 1.550.6.3 retrieving revision 1.550.6.4 diff -u -r1.550.6.3 -r1.550.6.4 --- .cvsignore 24 Feb 2007 17:47:19 -0000 1.550.6.3 +++ .cvsignore 4 Mar 2007 20:34:50 -0000 1.550.6.4 @@ -7,3 +7,5 @@ patch-2.6.19.3.bz2 patch-2.6.19.3-4.bz2 patch-2.6.19.4-5.bz2 +patch-2.6.19.5-6.bz2 +patch-2.6.19.6-7.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2911.6.4 retrieving revision 1.2911.6.5 diff -u -r1.2911.6.4 -r1.2911.6.5 --- kernel-2.6.spec 24 Feb 2007 17:47:19 -0000 1.2911.6.4 +++ kernel-2.6.spec 4 Mar 2007 20:34:50 -0000 1.2911.6.5 @@ -312,6 +312,8 @@ Patch1: patch-2.6.19.3.bz2 Patch2: patch-2.6.19.3-4.bz2 Patch3: patch-2.6.19.4-5.bz2 +Patch4: patch-2.6.19.5-6.bz2 +Patch5: patch-2.6.19.6-7.bz2 # Patches 10 through 99 are for things that are going upstream really soon. Patch10: linux-2.6-utrace.patch @@ -334,8 +336,6 @@ Patch206: linux-2.6-19_20-2_no_handler_for_vector.patch Patch207: linux-2.6-19_20-3_robust_apic_in_service_vector.patch -Patch210: linux-2.6-19_20-swiotlb_sync_single_bug.patch - # 300 - 399 ppc(64) Patch301: linux-2.6-cell-mambo-drivers.patch Patch302: linux-2.6-hvc-console.patch @@ -420,13 +420,10 @@ # core networking changes. # Sound driver fixes -Patch1350: linux-2.6-19-snd-hda-si3054-dont-return-error.patch # Filesystem stuff. # Squashfs Patch1400: linux-2.6-squashfs.patch -# Misc fixes -Patch1403: linux-2.6-19-bad_inode_ops.patch # GFS/DLM Patch1411: linux-2.6-gfs2-tux.patch @@ -447,7 +444,6 @@ Patch1650: linux-2.6-serial-460800.patch Patch1681: linux-2.6-xfs-umount-fix.patch Patch1682: linux-2.6-xfs_attr2.patch -Patch1683: linux-2.6-CIFS-null-terminator.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 @@ -487,9 +483,7 @@ # Net driver fixes. Patch2500: linux-2.6-net-forcedeth-suspend.patch -Patch2501: linux-2.6-19_20-usbnet_failure_path_oops.patch Patch2503: linux-2.6-fedora-net_forcedeth_disable_msi.patch -Patch2504: linux-2.6-NAPI-irqsave.patch # OLPC drivers Patch5000: linux-2.6-mtd-update.patch @@ -818,6 +812,8 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -854,9 +850,6 @@ %patch206 -p1 %patch207 -p1 -# swiotlb sync fix -%patch210 -p1 - # # PowerPC # @@ -999,14 +992,10 @@ # core networking changes. # sound driver fixes -# intel hda broken with si3054 codec -%patch1350 -p1 # Filesystem patches. # Squashfs %patch1400 -p1 -# bad_inode_ops security fix (CVE-2006-5753) -%patch1403 -p1 # GFS2/DLM #%patch1411 -p1 @@ -1033,8 +1022,6 @@ %patch1681 -p1 # Fix attr2 corruption with btree data extents %patch1682 -p1 -# Fix CIFS null termination bug -%patch1683 -p1 # Align kernel data segment to page boundary. %patch1690 -p1 # setuid /proc/self/maps fix. @@ -1096,12 +1083,8 @@ # Network driver fixes. # suspend/resume for forcedeth %patch2500 -p1 -# usbnet oops fix -%patch2501 -p1 # disable MSI on forcedeth cards %patch2503 -p1 -# net drivers: more NAPI fixes -%patch2504 -p1 # # Patches 5000 to 6000 are reserved for new drivers that are about to @@ -2075,6 +2058,10 @@ %endif %changelog +* Sun Mar 4 2007 Chuck Ebbert +- 2.6.19.7 +- 2.6.19.6 + * Sat Feb 24 2007 Chuck Ebbert - 2.6.19.5 - re-enable Xen Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v retrieving revision 1.514.6.2 retrieving revision 1.514.6.3 diff -u -r1.514.6.2 -r1.514.6.3 --- sources 24 Feb 2007 17:47:20 -0000 1.514.6.2 +++ sources 4 Mar 2007 20:34:50 -0000 1.514.6.3 @@ -3,3 +3,5 @@ ef8491f189893c250a61cea825de025c patch-2.6.19.3.bz2 32d58db1efaddc9af079c04a6409bc2e patch-2.6.19.3-4.bz2 349195718c3850c34e18c71004e1d4c7 patch-2.6.19.4-5.bz2 +ec8ce9fe712142bc97a79b6a9c82eafd patch-2.6.19.5-6.bz2 +20478d93a2b05d84d6cb340d3068f26a patch-2.6.19.6-7.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/upstream,v retrieving revision 1.435.6.2 retrieving revision 1.435.6.3 diff -u -r1.435.6.2 -r1.435.6.3 --- upstream 24 Feb 2007 17:47:20 -0000 1.435.6.2 +++ upstream 4 Mar 2007 20:34:51 -0000 1.435.6.3 @@ -2,3 +2,5 @@ patch-2.6.19.3.bz2 patch-2.6.19.3-4.bz2 patch-2.6.19.4-5.bz2 +patch-2.6.19.5-6.bz2 +patch-2.6.19.6-7.bz2 --- linux-2.6-19-bad_inode_ops.patch DELETED --- --- linux-2.6-19-snd-hda-si3054-dont-return-error.patch DELETED --- --- linux-2.6-19_20-swiotlb_sync_single_bug.patch DELETED --- --- linux-2.6-19_20-usbnet_failure_path_oops.patch DELETED --- --- linux-2.6-CIFS-null-terminator.patch DELETED --- --- linux-2.6-NAPI-irqsave.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 5 02:54:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 4 Mar 2007 21:54:03 -0500 Subject: rpms/hal/devel .cvsignore, 1.43, 1.44 hal.spec, 1.118, 1.119 sources, 1.44, 1.45 Message-ID: <200703050254.l252s3vI009732@cvs.devel.redhat.com> Author: davidz Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9499 Modified Files: .cvsignore hal.spec sources Log Message: * Sun Mar 4 2007 David Zeuthen - 0.5.9-0.git20070304 - Update to 0.5.9rc1; notable user visible changes: - New /sbin/umount.hal helper (#188193) - Slow down polling if no session is non-idle (#204969) - Refuse to eject busy devices (#207177) - Don't mount noexec unless requested - Use inotify to watch for new fdi files - Support for new Firewire stack - BT killswitch for Sony laptops (hadess) - Pass suspend quirks to pm-utils (need new pm-utils release to use it) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 19 Feb 2007 00:09:01 -0000 1.43 +++ .cvsignore 5 Mar 2007 02:54:00 -0000 1.44 @@ -32,3 +32,5 @@ hal-0.5.9.git20070206.tar.gz hal-info-20070206.tar.gz hal-0.5.9.git20070218.tar.gz +hal-info-20070304.tar.gz +hal-0.5.9.git20070304.tar.gz Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- hal.spec 19 Feb 2007 00:09:01 -0000 1.118 +++ hal.spec 5 Mar 2007 02:54:00 -0000 1.119 @@ -21,14 +21,14 @@ %define hal_user_uid 68 -%define hal_info_version 20070206 +%define hal_info_version 20070304 Summary: Hardware Abstraction Layer Name: hal Version: 0.5.9 -Release: 0.git20070218%{?dist} +Release: 0.git20070304%{?dist} URL: http://www.freedesktop.org/Software/hal -Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.git20070218.tar.gz +Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.git20070304.tar.gz Source1: 99-redhat-storage-policy-fixed-drives.fdi Source2: hal-device-manager.desktop Source3: http://people.freedesktop.org/~david/dist/hal-info-%{hal_info_version}.tar.gz @@ -109,7 +109,7 @@ %setup -q -a 3 %build -%configure --disable-docbook-docs --with-os-type=redhat --enable-console-kit --enable-acl-management +%configure --disable-docbook-docs --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper cd hal-info-%{hal_info_version} %configure @@ -177,6 +177,7 @@ %dir %{_sysconfdir}/hal %{_sysconfdir}/hal/* +/sbin/umount.hal %{_sbindir}/hald %{_bindir}/* %{_libexecdir}/* @@ -212,6 +213,17 @@ %{_datadir}/applications/*.desktop %changelog +* Sun Mar 4 2007 David Zeuthen - 0.5.9-0.git20070304 +- Update to 0.5.9rc1; notable user visible changes: +- New /sbin/umount.hal helper (#188193) +- Slow down polling if no session is non-idle (#204969) +- Refuse to eject busy devices (#207177) +- Don't mount noexec unless requested +- Use inotify to watch for new fdi files +- Support for new Firewire stack +- BT killswitch for Sony laptops (hadess) +- Pass suspend quirks to pm-utils (need new pm-utils release to use it) + * Sun Feb 18 2007 David Zeuthen - 0.5.9-0.git20070218%{?dist} - Update to git snapshot (will require SELinux policy changes) - HAL will now add/remove ACL's for local sessions (needed for f-u-s) Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 19 Feb 2007 00:09:01 -0000 1.44 +++ sources 5 Mar 2007 02:54:00 -0000 1.45 @@ -1,2 +1,2 @@ -3b05543952401eb54984375e81fa7c16 hal-info-20070206.tar.gz -1385c78fc5d496f77f6a971791034584 hal-0.5.9.git20070218.tar.gz +6b5c6060415f8d12f509391cfebdfa4f hal-info-20070304.tar.gz +11e24926ec5e4542c1261529667d0437 hal-0.5.9.git20070304.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 5 03:38:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 4 Mar 2007 22:38:07 -0500 Subject: rpms/ImageMagick/devel .cvsignore, 1.18, 1.19 ImageMagick.spec, 1.67, 1.68 sources, 1.18, 1.19 Message-ID: <200703050338.l253c7NC029204@cvs.devel.redhat.com> Author: nmurray Update of /cvs/dist/rpms/ImageMagick/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv813 Modified Files: .cvsignore ImageMagick.spec sources Log Message: Update to 6.3.2-9 tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 9 Jun 2006 13:27:19 -0000 1.18 +++ .cvsignore 5 Mar 2007 03:38:03 -0000 1.19 @@ -1 +1,2 @@ ImageMagick-6.2.8-0.tar.bz2 +ImageMagick-6.3.2-9.tar.bz2 Index: ImageMagick.spec =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- ImageMagick.spec 23 Aug 2006 07:05:22 -0000 1.67 +++ ImageMagick.spec 5 Mar 2007 03:38:03 -0000 1.68 @@ -1,7 +1,7 @@ # ImageMagick has adopted a new Version.Patchlevel version numbering system... # 5.4.0.3 is actually version 5.4.0, Patchlevel 3. -%define VER 6.2.8 -%define Patchlevel 0 +%define VER 6.3.2 +%define Patchlevel 9 Summary: An X application for displaying and manipulating images. Name: ImageMagick %if "%{Patchlevel}" != "" @@ -9,7 +9,7 @@ %else Version: %{VER} %endif -Release: 3%{?dist} +Release: 1%{?dist} License: freeware Group: Applications/Multimedia %if "%{Patchlevel}" != "" @@ -20,19 +20,16 @@ Source1: magick_small.png Patch1: ImageMagick-6.2.1-local_doc.patch Patch2: ImageMagick-6.2.8-multilib.patch -# 202193 -Patch3: ImageMagick-6.2.8-cve-2006-3743.patch -# 202771 -Patch4: ImageMagick-6.2.8-cve-2006-4144.patch Url: http://www.imagemagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel BuildPrereq: libtiff-devel, libungif-devel, zlib-devel, perl -BuildRequires: freetype-devel >= 2.0.1 +BuildRequires: freetype-devel >= 2.1 BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 BuildRequires: ghostscript-devel +BuildRequires: perl-devel BuildRequires: libwmf-devel BuildRequires: libX11-devel, libXext-devel, libXt-devel BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel @@ -59,6 +56,7 @@ Requires: libX11-devel, libXext-devel, libXt-devel Requires: ghostscript-devel Requires: bzip2-devel +Requires: freetype-devel Requires: libtiff-devel Requires: libjpeg-devel Requires: lcms-devel @@ -121,8 +119,6 @@ %setup -q -n %{name}-%{VER} %patch1 -p1 -b .local_doc %patch2 -p1 -b .multilib -%patch3 -p1 -b .cve-2006-3743 -%patch4 -p1 -b .cve-2006-4144 %build %configure --enable-shared \ @@ -258,6 +254,9 @@ %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Fri Mar 2 2007 Norm Murray 6.3.2.9-1.fc7.0 +- update to 6.3.2-9 + * Wed Aug 23 2006 Matthias Clasen - 6.2.8.0-3.fc6 - fix several integer and buffer overflows (#202193, CVE-2006-3743) - fix more integer overflows (#202771, CVE-2006-4144) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 9 Jun 2006 13:27:19 -0000 1.18 +++ sources 5 Mar 2007 03:38:03 -0000 1.19 @@ -1 +1,2 @@ 484cd7b62fac2164e8257449405f2563 ImageMagick-6.2.8-0.tar.bz2 +89e118517c64cac04cedf8746e0f1005 ImageMagick-6.3.2-9.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 5 07:22:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 02:22:32 -0500 Subject: rpms/kernel/devel patch-2.6.21-rc2-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.578, 1.579 kernel-2.6.spec, 1.2962, 1.2963 linux-2.6-compile-fixes.patch, 1.142, 1.143 sources, 1.541, 1.542 upstream, 1.470, 1.471 patch-2.6.21-rc2-git2.bz2.sign, 1.1, NONE Message-ID: <200703050722.l257MWFb018703@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18390 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch sources upstream Added Files: patch-2.6.21-rc2-git3.bz2.sign Removed Files: patch-2.6.21-rc2-git2.bz2.sign Log Message: * Mon Mar 05 2007 Dave Jones - 2.6.21rc2-git3 --- NEW FILE patch-2.6.21-rc2-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF6Sv/yGugalF9Dw4RAgVKAJ9uTbhReTTyngltZFtox8wsyOpGvQCeP3hj 7WIhQ8yXfiiuSLNKYcF3V14= =S1Ri -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.578 retrieving revision 1.579 diff -u -r1.578 -r1.579 --- .cvsignore 2 Mar 2007 23:53:19 -0000 1.578 +++ .cvsignore 5 Mar 2007 07:22:29 -0000 1.579 @@ -4,4 +4,4 @@ kernel-2.6.20 linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git2.bz2 +patch-2.6.21-rc2-git3.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2962 retrieving revision 1.2963 diff -u -r1.2962 -r1.2963 --- kernel-2.6.spec 2 Mar 2007 23:52:05 -0000 1.2962 +++ kernel-2.6.spec 5 Mar 2007 07:22:29 -0000 1.2963 @@ -295,7 +295,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.21-rc2.bz2 -Patch2: patch-2.6.21-rc2-git2.bz2 +Patch2: patch-2.6.21-rc2-git3.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -2036,6 +2036,9 @@ # - tux. %changelog +* Mon Mar 05 2007 Dave Jones +- 2.6.21rc2-git3 + * Fri Mar 02 2007 Dave Jones - 2.6.21rc2-git2 linux-2.6-compile-fixes.patch: linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c | 4 ++++ linux-2.6.20.noarch/drivers/video/nvidia/nv_backlight.c | 3 +++ 2 files changed, 7 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.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- linux-2.6-compile-fixes.patch 1 Mar 2007 07:16:34 -0000 1.142 +++ linux-2.6-compile-fixes.patch 5 Mar 2007 07:22:29 -0000 1.143 @@ -67,15 +67,3 @@ #include "nv_local.h" #include "nv_type.h" #include "nv_proto.h" ---- linux-2.6.20.noarch/drivers/net/mv643xx_eth.h~ 2007-02-28 15:07:43.000000000 -0500 -+++ linux-2.6.20.noarch/drivers/net/mv643xx_eth.h 2007-02-28 15:07:51.000000000 -0500 -@@ -47,7 +47,7 @@ - #define ETH_HW_IP_ALIGN 2 /* hw aligns IP header */ - #define ETH_WRAPPER_LEN (ETH_HW_IP_ALIGN + ETH_HLEN + \ - ETH_VLAN_HLEN + ETH_FCS_LEN) --#define ETH_RX_SKB_SIZE (dev->mtu + ETH_WRAPPER_LEN + ETH_DMA_ALIGN) -+#define ETH_RX_SKB_SIZE (dev->mtu + ETH_WRAPPER_LEN + dma_get_cache_alignment()) - - #define ETH_RX_QUEUES_ENABLED (1 << 0) /* use only Q0 for receive */ - #define ETH_TX_QUEUES_ENABLED (1 << 0) /* use only Q0 for transmit */ - Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.541 retrieving revision 1.542 diff -u -r1.541 -r1.542 --- sources 2 Mar 2007 23:53:19 -0000 1.541 +++ sources 5 Mar 2007 07:22:29 -0000 1.542 @@ -1,3 +1,3 @@ 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 e31c877d30a840c590c06e53779246f4 patch-2.6.21-rc2.bz2 -639c61af04502661387c806bfac249d0 patch-2.6.21-rc2-git2.bz2 +0b119fcef1ed2d4e6c3a7a84f4be9902 patch-2.6.21-rc2-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.470 retrieving revision 1.471 diff -u -r1.470 -r1.471 --- upstream 2 Mar 2007 23:52:05 -0000 1.470 +++ upstream 5 Mar 2007 07:22:29 -0000 1.471 @@ -1,3 +1,3 @@ linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git2.bz2 +patch-2.6.21-rc2-git3.bz2 --- patch-2.6.21-rc2-git2.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 5 07:41:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 02:41:15 -0500 Subject: rpms/kernel/devel/configs config-debug, 1.3, 1.4 config-generic, 1.298, 1.299 config-ia64-generic, 1.51, 1.52 config-nodebug, 1.3, 1.4 config-powerpc-generic, 1.38, 1.39 config-powerpc32-generic, 1.22, 1.23 config-powerpc64, 1.29, 1.30 config-powerpc64-generic, 1.15, 1.16 config-powerpc64-iseries, 1.23, 1.24 config-x86-generic, 1.79, 1.80 config-x86_64-generic, 1.65, 1.66 config-x86_64-kdump, 1.2, 1.3 Message-ID: <200703050741.l257fFim024599@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv24574/configs Modified Files: config-debug config-generic config-ia64-generic config-nodebug config-powerpc-generic config-powerpc32-generic config-powerpc64 config-powerpc64-generic config-powerpc64-iseries config-x86-generic config-x86_64-generic config-x86_64-kdump Log Message: config cleanup. removing dead symbols. Index: config-debug =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-debug,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-debug 21 Feb 2007 05:33:19 -0000 1.3 +++ config-debug 5 Mar 2007 07:41:08 -0000 1.4 @@ -1,7 +1,6 @@ CONFIG_DEBUG_SLAB=y CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_RWSEMS=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y CONFIG_DEBUG_VM=y Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.298 retrieving revision 1.299 diff -u -r1.298 -r1.299 --- config-generic 2 Mar 2007 23:52:05 -0000 1.298 +++ config-generic 5 Mar 2007 07:41:08 -0000 1.299 @@ -68,8 +68,7 @@ # CONFIG_PCI_MULTITHREAD_PROBE is not set 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_PCIE=m CONFIG_HOTPLUG_PCI_FAKE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_ISA=y @@ -260,7 +259,7 @@ # CONFIG_PNPBIOS is not set CONFIG_HOTPLUG_PCI_ACPI=m -CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m # # Block devices @@ -798,7 +797,6 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_NAT=m @@ -993,7 +991,7 @@ # # ATM -# +# # CONFIG_ATM_DUMMY is not set CONFIG_ATM_CLIP=m CONFIG_ATM_LANE=m @@ -2047,7 +2045,6 @@ CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m -CONFIG_VIDEO_VIDEOBUF=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_BUF=m CONFIG_VIDEO_BTCX=m @@ -2265,10 +2262,8 @@ # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set -CONFIG_USB_MULTITHREAD_PROBE=y # # USB Host Controller Drivers @@ -2311,8 +2306,6 @@ # USB Human Interface Devices (HID) # CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT=y -CONFIG_USB_HID_POWERBOOK=y CONFIG_HID=m # CONFIG_HID_DEBUG is not set @@ -2579,7 +2572,6 @@ CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_ZISOFS=y -CONFIG_ZISOFS_FS=y CONFIG_UDF_FS=m # @@ -2616,7 +2608,6 @@ # CONFIG_BEFS_DEBUG is not set CONFIG_BFS_FS=m CONFIG_EFS_FS=m -# CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=0 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set @@ -2877,7 +2868,6 @@ CONFIG_ATA_OVER_ETH=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m -CONFIG_BACKLIGHT_DEVICE=y CONFIG_BACKLIGHT_PROGEAR=m CONFIG_FB_NVIDIA_BACKLIGHT=y CONFIG_FB_RIVA_BACKLIGHT=y @@ -2886,7 +2876,6 @@ CONFIG_FB_ATY_BACKLIGHT=y CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_DEVICE=y CONFIG_SCHEDSTATS=y @@ -2898,7 +2887,6 @@ CONFIG_CPUSETS=y CONFIG_SYSFS_DEPRECATED=y CONFIG_RELAY=y -# CONFIG_SECCOMP is not set # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_MUST_CHECK=y @@ -3111,9 +3099,6 @@ CONFIG_HZ_1000=y -CONFIG_NO_HZ=y - -CONFIG_HIGH_RES_TIMERS=y CONFIG_TIMER_STATS=y # Auxillary displays Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- config-ia64-generic 14 Feb 2007 18:26:48 -0000 1.51 +++ config-ia64-generic 5 Mar 2007 07:41:08 -0000 1.52 @@ -137,7 +137,6 @@ # CONFIG_HPET is not set # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_SHPC=m -CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y CONFIG_HOTPLUG_PCI_SGI=m CONFIG_PNPACPI=y Index: config-nodebug =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-nodebug,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-nodebug 21 Feb 2007 05:33:19 -0000 1.3 +++ config-nodebug 5 Mar 2007 07:41:08 -0000 1.4 @@ -1,7 +1,6 @@ CONFIG_DEBUG_SLAB=y CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_RWSEMS=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y CONFIG_DEBUG_VM=y Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- config-powerpc-generic 12 Feb 2007 23:45:45 -0000 1.38 +++ config-powerpc-generic 5 Mar 2007 07:41:08 -0000 1.39 @@ -6,9 +6,13 @@ CONFIG_DEBUGGER=y CONFIG_GENERIC_NVRAM=y CONFIG_ALTIVEC=y + CONFIG_TAU=y # CONFIG_TAU_INT is not set CONFIG_TAU_AVERAGE=y + +# CONFIG_SECCOMP is not set + CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEBUG=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set @@ -21,9 +25,11 @@ CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y + CONFIG_PM=y CONFIG_SOFTWARE_SUSPEND=y CONFIG_PM_STD_PARTITION="" + # CONFIG_RTC is not set CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set @@ -146,7 +152,7 @@ # # CONFIG_IDE_GENERIC is not set # CONFIG_BLK_DEV_IDEPNP is not set -# CONFIG_BLK_DEV_IDEPCI is not set +# CONFIG_BLK_DEV_IDEPCI is not set CONFIG_IDEPCI_SHARE_IRQ=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y Index: config-powerpc32-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- config-powerpc32-generic 25 Feb 2007 23:42:45 -0000 1.22 +++ config-powerpc32-generic 5 Mar 2007 07:41:08 -0000 1.23 @@ -37,9 +37,6 @@ CONFIG_MACE=m # CONFIG_MACE_AAUI_PORT is not set CONFIG_MV643XX_ETH=m -CONFIG_MV643XX_ETH_0=y -CONFIG_MV643XX_ETH_1=y -CONFIG_MV643XX_ETH_2=y CONFIG_I2C_HYDRA=m CONFIG_I2C_MPC=m CONFIG_THERM_WINDTUNNEL=m Index: config-powerpc64 =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- config-powerpc64 28 Feb 2007 17:44:24 -0000 1.29 +++ config-powerpc64 5 Mar 2007 07:41:08 -0000 1.30 @@ -42,7 +42,6 @@ CONFIG_ADB_PMU_LED_IDE=y CONFIG_PMAC_SMU=y CONFIG_CPU_FREQ_PMAC64=y -CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y CONFIG_SCSI_IPR=m CONFIG_SCSI_IPR_TRACE=y CONFIG_SCSI_IPR_DUMP=y @@ -80,3 +79,4 @@ # CONFIG_BLK_DEV_IDE_CELLEB is not set CONFIG_PATA_SCC=m + Index: config-powerpc64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-generic,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- config-powerpc64-generic 19 Dec 2006 18:55:12 -0000 1.15 +++ config-powerpc64-generic 5 Mar 2007 07:41:08 -0000 1.16 @@ -33,3 +33,5 @@ CONFIG_XMON_DISASSEMBLY=y CONFIG_SCSI_IBMVSCSIS=m + +# CONFIG_SECCOMP is not set Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- config-powerpc64-iseries 1 Mar 2007 15:48:07 -0000 1.23 +++ config-powerpc64-iseries 5 Mar 2007 07:41:08 -0000 1.24 @@ -59,7 +59,6 @@ # CONFIG_HOTPLUG_PCI_FAKE is not set # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_SHPC=m -CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y CONFIG_SCSI_IBMVSCSI=m CONFIG_SERIAL_ICOM=m # CONFIG_ISDN is not set Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- config-x86-generic 22 Feb 2007 21:17:27 -0000 1.79 +++ config-x86-generic 5 Mar 2007 07:41:08 -0000 1.80 @@ -38,7 +38,6 @@ CONFIG_NR_CPUS=32 CONFIG_X86_GENERIC=y CONFIG_X86_CMPXCHG=y -CONFIG_X86_XADD=y CONFIG_X86_L1_CACHE_SHIFT=7 CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_X86_PPRO_FENCE=y @@ -91,6 +90,8 @@ CONFIG_SCSI_FUTURE_DOMAIN=m CONFIG_SCSI_ADVANSYS=m +# CONFIG_SECCOMP is not set + CONFIG_CAPI_EICON=y CONFIG_I2O=m @@ -133,7 +134,6 @@ CONFIG_ACPI_DOCK=m CONFIG_ACPI_EC=y CONFIG_ACPI_FAN=y -# CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_IBM=m # CONFIG_ACPI_IBM_DOCK is not set CONFIG_ACPI_NUMA=y @@ -228,7 +228,6 @@ # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set # SHPC has half-arsed PCI probing, which makes it load on too many systems # CONFIG_HOTPLUG_PCI_SHPC is not set -# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set CONFIG_PM=y CONFIG_IEEE80211=m @@ -327,3 +326,6 @@ CONFIG_SONY_LAPTOP=m +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- config-x86_64-generic 22 Feb 2007 21:17:27 -0000 1.65 +++ config-x86_64-generic 5 Mar 2007 07:41:08 -0000 1.66 @@ -35,6 +35,8 @@ CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m +# CONFIG_SECCOMP is not set + CONFIG_GENERIC_ISA_DMA=y CONFIG_SCHED_SMT=y CONFIG_SOFTWARE_SUSPEND=y @@ -95,7 +97,6 @@ # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set # SHPC has half-arsed PCI probing, which makes it load on too many systems CONFIG_HOTPLUG_PCI_SHPC=m -# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set CONFIG_HPET=y # CONFIG_HPET_MMAP is not set # CONFIG_HPET_RTC_IRQ is not set Index: config-x86_64-kdump =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-kdump,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-x86_64-kdump 23 Jun 2006 20:35:09 -0000 1.2 +++ config-x86_64-kdump 5 Mar 2007 07:41:08 -0000 1.3 @@ -2,10 +2,3 @@ CONFIG_CRASH_DUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_PROC_VMCORE=y -# FIXME: broken June 23rd -# In file included from include/asm/msi.h:11, -# from drivers/pci/msi.h:71, -# from drivers/pci/msi-apic.c:8: -# include/asm/smp.h:103: error: expected ')' before '->' token -# make[2]: *** [drivers/pci/msi-apic.o] Error 1 -# CONFIG_PCI_MSI is not set From fedora-cvs-commits at redhat.com Mon Mar 5 07:57:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 02:57:46 -0500 Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.143,1.144 Message-ID: <200703050757.l257vkiT018066@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18046 Modified Files: linux-2.6-compile-fixes.patch Log Message: build fix linux-2.6-compile-fixes.patch: b/drivers/ata/pata_jmicron.c | 1 - linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c | 4 ++++ linux-2.6.20.noarch/drivers/video/nvidia/nv_backlight.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- linux-2.6-compile-fixes.patch 5 Mar 2007 07:22:29 -0000 1.143 +++ linux-2.6-compile-fixes.patch 5 Mar 2007 07:57:44 -0000 1.144 @@ -67,3 +67,23 @@ #include "nv_local.h" #include "nv_type.h" #include "nv_proto.h" +commit 527e1e1879cb10958b7ad4e04b3877abf54df3bd +Author: Jeff Garzik +Date: Sat Mar 3 10:36:19 2007 -0500 + + [libata] pata_jmicron: build fix + + Signed-off-by: Jeff Garzik + +diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c +index 033319e..43763c9 100644 +--- a/drivers/ata/pata_jmicron.c ++++ b/drivers/ata/pata_jmicron.c +@@ -244,7 +244,6 @@ static void __exit jmicron_exit(void) + { + pci_unregister_driver(&jmicron_pci_driver); + } +-#endif + + module_init(jmicron_init); + module_exit(jmicron_exit); From fedora-cvs-commits at redhat.com Mon Mar 5 08:39:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 03:39:40 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.8, 1.9 openoffice.org.spec, 1.1087, 1.1088 openoffice.org.2.0.3.gcc28409.anonymousexternc.patch, 1.1, NONE Message-ID: <200703050839.l258deMG031264@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31212 Modified Files: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch openoffice.org.spec Removed Files: openoffice.org.2.0.3.gcc28409.anonymousexternc.patch Log Message: break testtools as well openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch: bin/modules/installer/globals.pm | 0 bin/modules/installer/servicesfile.pm | 0 postprocess/prj/build.lst | 2 +- solenv/bin/modules/installer/globals.pm | 2 +- solenv/bin/modules/installer/servicesfile.pm | 1 - 5 files changed, 2 insertions(+), 3 deletions(-) Index: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 28 Feb 2007 16:58:45 -0000 1.8 +++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 5 Mar 2007 08:39:37 -0000 1.9 @@ -29,3 +29,11 @@ } else { +--- openoffice.org.orig/postprocess/prj/build.lst 2007-03-05 08:39:30.000000000 +0000 ++++ openoffice.org/postprocess/prj/build.lst 2007-03-05 08:39:39.000000000 +0000 +@@ -1,4 +1,4 @@ +-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL ++po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL + po postprocess usr1 - all po_mkout NULL + po postprocess\checkxml nmake - all po_checkxml NULL + po postprocess\checkdeliver nmake - all po_checkdlv NULL Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1087 retrieving revision 1.1088 diff -u -r1.1087 -r1.1088 --- openoffice.org.spec 4 Mar 2007 13:01:41 -0000 1.1087 +++ openoffice.org.spec 5 Mar 2007 08:39:37 -0000 1.1088 @@ -1,6 +1,6 @@ %define oootag OOF680 %define ooomilestone 10 -%define rh_rpm_release 1.0 +%define rh_rpm_release 1 # gcc#19664# %define stlvisibilityfcked 1 @@ -1070,7 +1070,7 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics" +export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64" #convert _smp_mflags to dmake equivalent SMP_MFLAGS=%{?_smp_mflags} SMP_MFLAGS=${SMP_MFLAGS/-j/-P} --- openoffice.org.2.0.3.gcc28409.anonymousexternc.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 5 08:39:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 03:39:56 -0500 Subject: rpms/gawk/devel gawk.spec,1.49,1.50 Message-ID: <200703050839.l258dunQ031522@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/gawk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31469 Modified Files: gawk.spec Log Message: fix typo in package desc Index: gawk.spec =================================================================== RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gawk.spec 1 Mar 2007 15:37:49 -0000 1.49 +++ gawk.spec 5 Mar 2007 08:39:54 -0000 1.50 @@ -35,7 +35,7 @@ Patch12: gawk-3.1.5-mbread.patch %description -The gawk packages contains the GNU version of awk, a text processing +The gawk package contains the GNU version of awk, a text processing utility. Awk interprets a special-purpose programming language to do quick and easy text pattern matching and reformatting jobs. From fedora-cvs-commits at redhat.com Mon Mar 5 08:41:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 03:41:40 -0500 Subject: rpms/mailx/devel mailx.spec,1.24,1.25 Message-ID: <200703050841.l258feUE000420@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/mailx/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32711 Modified Files: mailx.spec Log Message: - add /usr/share/mailx directory Index: mailx.spec =================================================================== RCS file: /cvs/dist/rpms/mailx/devel/mailx.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mailx.spec 23 Feb 2007 14:39:21 -0000 1.24 +++ mailx.spec 5 Mar 2007 08:41:38 -0000 1.25 @@ -1,7 +1,7 @@ Summary: The /bin/mail program for sending e-mail messages Name: mailx Version: 8.1.1 -Release: 45%{?dist} +Release: 46%{?dist} License: BSD Group: Applications/Internet Source: ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx-%{version}.tar.gz @@ -100,6 +100,7 @@ %doc debian/copyright %attr(755,root,mail) /bin/mail %{_bindir}/Mail +%{_datadir}/mailx %{_datadir}/mailx/mail.help %{_datadir}/mailx/mail.tildehelp %config(noreplace) /etc/mail.rc @@ -107,6 +108,9 @@ %{_mandir}/man1/Mail.1* %changelog +* Mon Mar 5 2007 Ivana Varekova - 8.1.1-46 +- add /usr/share/mailx directory + * Fri Feb 23 2007 Ivana Varekova - 8.1.1-45 - incorporate the package review feedback (226118) From fedora-cvs-commits at redhat.com Mon Mar 5 08:51:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 03:51:04 -0500 Subject: rpms/at/devel .cvsignore,1.5,1.6 at.spec,1.50,1.51 sources,1.5,1.6 Message-ID: <200703050851.l258p43d000324@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/at/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32659 Modified Files: .cvsignore at.spec sources Log Message: Update spec for review. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/at/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Oct 2006 14:25:28 -0000 1.5 +++ .cvsignore 5 Mar 2007 08:51:02 -0000 1.6 @@ -1 +1 @@ -at-3.1.10.tar.gz +at_3.1.10.tar.gz Index: at.spec =================================================================== RCS file: /cvs/dist/rpms/at/devel/at.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- at.spec 20 Feb 2007 14:44:20 -0000 1.50 +++ at.spec 5 Mar 2007 08:51:02 -0000 1.51 @@ -6,11 +6,11 @@ Summary: Job spooling tools Name: at Version: 3.1.10 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: System Environment/Daemons URL: http://ftp.debian.org/debian/pool/main/a/at -Source: http://ftp.debian.org/debian/pool/main/a/at/at-%{major_ver}.tar.gz +Source: http://ftp.debian.org/debian/pool/main/a/at/at_%{major_ver}.tar.gz Source1: test.pl Source2: atd.init Patch0: at-3.1.7-lockfile.patch @@ -183,6 +183,9 @@ %attr(4755,root,root) %{_bindir}/at %changelog +* Mon Mar 03 2007 Marcela Maslanova - 3.1.10-9 +- review + * Wed Feb 20 2007 Marcela Maslanova - 3.1.10-8 - review - rhbz#225288 Index: sources =================================================================== RCS file: /cvs/dist/rpms/at/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Oct 2006 14:25:28 -0000 1.5 +++ sources 5 Mar 2007 08:51:02 -0000 1.6 @@ -1 +1 @@ -a020a2ec32e1d629c0eef91e5728efad at-3.1.10.tar.gz +6e5857e23b3c32ea6995fb7f8989987e at_3.1.10.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 5 10:02:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 05:02:42 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo63159.sal.dtype.patch, 1.2, 1.3 openoffice.org.spec, 1.1088, 1.1089 Message-ID: <200703051002.l25A2g72014780@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14764 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo63159.sal.dtype.patch Log Message: ah well, it doesn't hurt openoffice.org-2.2.0.ooo63159.sal.dtype.patch: openoffice.org/sal/osl/unx/file_impl.hxx | 18 ++++++++ sal/osl/unx/file.cxx | 64 ++++++++++++++++++++++++++++ sal/osl/unx/file_stat.cxx | 69 +++++++++++++++++++++++++++++-- 3 files changed, 148 insertions(+), 3 deletions(-) Index: openoffice.org-2.2.0.ooo63159.sal.dtype.patch =================================================================== RCS file: openoffice.org-2.2.0.ooo63159.sal.dtype.patch diff -N openoffice.org-2.2.0.ooo63159.sal.dtype.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openoffice.org-2.2.0.ooo63159.sal.dtype.patch 5 Mar 2007 10:02:39 -0000 1.3 @@ -0,0 +1,267 @@ +Index: sal/osl/unx/file.cxx +=================================================================== +RCS file: /cvs/porting/sal/osl/unx/file.cxx,v +retrieving revision 1.10 +diff -u -p -r1.10 file.cxx +--- openoffice.org.orig/sal/osl/unx/file.cxx 8 Sep 2005 14:53:53 -0000 1.10 ++++ openoffice.org/sal/osl/unx/file.cxx 18 Jan 2006 14:38:41 -0000 +@@ -156,6 +156,42 @@ + + #endif + ++#ifdef _DIRENT_HAVE_D_TYPE ++#include "file_impl.hxx" ++ oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType ) ++ { ++ oslDirectoryItemImpl *pItemObject = (oslDirectoryItemImpl*) malloc( sizeof( oslDirectoryItemImpl ) ); ++ pItemObject->RefCount = 1; ++ pItemObject->bHasType = _bHasDType; ++ pItemObject->DType = _DType; ++ pItemObject->ustrFilePath = _ustrFilePath; ++ ++ return pItemObject; ++ } ++ ++ void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem ) ++ { ++ if( pItem->ustrFilePath ) { ++ rtl_uString_release( pItem->ustrFilePath ); ++ pItem->ustrFilePath = NULL; ++ } ++ free( pItem ); ++ } ++ ++ void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem ) ++ { ++ pItem->RefCount ++; ++ } ++ ++ void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem ) ++ { ++ pItem->RefCount --; ++ ++ if( pItem->RefCount <= 0 ) ++ oslDirectoryItemImpl_Destroy( pItem ); ++ } ++#endif ++ + #if OSL_DEBUG_LEVEL > 1 + + extern void debug_ustring(rtl_uString*); +@@ -484,8 +520,14 @@ + osl_systemPathMakeAbsolutePath(pDirImpl->ustrPath, ustrFileName, &ustrFilePath); + rtl_uString_release( ustrFileName ); + ++#ifdef _DIRENT_HAVE_D_TYPE ++ if(*pItem) ++ oslDirectoryItemImpl_release( ( oslDirectoryItemImpl* )( *pItem ) ); ++ *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrFilePath, true, pEntry->d_type ); ++#else + /* use path as directory item */ + *pItem = (oslDirectoryItem) ustrFilePath; ++#endif + + return osl_File_E_None; + } +@@ -514,7 +556,11 @@ + + if (0 == access_u(ustrSystemPath, F_OK)) + { ++#ifdef _DIRENT_HAVE_D_TYPE ++ *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrSystemPath, false ); ++#else + *pItem = (oslDirectoryItem)ustrSystemPath; ++#endif + osl_error = osl_File_E_None; + } + else +@@ -532,12 +578,21 @@ + + oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item ) + { ++#ifdef _DIRENT_HAVE_D_TYPE ++ oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item; ++#else + rtl_uString* ustrFilePath = (rtl_uString *) Item; ++#endif + + OSL_ASSERT( Item ); + ++#ifdef _DIRENT_HAVE_D_TYPE ++ if( pImpl ) ++ oslDirectoryItemImpl_acquire( pImpl ); ++#else + if( ustrFilePath ) + rtl_uString_acquire( ustrFilePath ); ++#endif + + return osl_File_E_None; + } +@@ -548,12 +603,21 @@ + + oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item ) + { ++#ifdef _DIRENT_HAVE_D_TYPE ++ oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item; ++#else + rtl_uString* ustrFilePath = (rtl_uString *) Item; ++#endif + + OSL_ASSERT( Item ); + ++#ifdef _DIRENT_HAVE_D_TYPE ++ if( pImpl ) ++ oslDirectoryItemImpl_release( pImpl ); ++#else + if( ustrFilePath ) + rtl_uString_release( ustrFilePath ); ++#endif + + return osl_File_E_None; + } +Index: sal/osl/unx/file_stat.cxx +=================================================================== +RCS file: /cvs/porting/sal/osl/unx/file_stat.cxx,v +retrieving revision 1.6 +diff -u -p -r1.6 file_stat.cxx +--- openoffice.org.orig/sal/osl/unx/file_stat.cxx 8 Sep 2005 14:56:14 -0000 1.6 ++++ openoffice.org/sal/osl/unx/file_stat.cxx 18 Jan 2006 14:38:41 -0000 +@@ -45,6 +45,10 @@ + #include + #endif + ++#ifndef _DIRENT_H ++#include ++#endif ++ + #ifndef _OSL_FILE_H_ + #include + #endif +@@ -69,6 +73,9 @@ + #include "file_error_transl.h" + #endif + ++#ifdef _DIRENT_HAVE_D_TYPE ++#include "file_impl.hxx" ++#endif + + namespace /* private */ + { +@@ -236,9 +243,19 @@ namespace /* private */ + + /* we only need to call stat or lstat if one of the + following flags is set */ ++#ifdef _DIRENT_HAVE_D_TYPE ++ inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslDirectoryItemImpl *pImpl) ++#else + inline bool is_stat_call_necessary(sal_uInt32 field_mask) ++#endif + { +- return ((field_mask & osl_FileStatus_Mask_Type) || ++ return ( ++/* on linux the dirent might have d_type */ ++#ifdef _DIRENT_HAVE_D_TYPE ++ ((field_mask & osl_FileStatus_Mask_Type) && (!pImpl->bHasType || pImpl->DType == DT_UNKNOWN)) || ++#else ++ (field_mask & osl_FileStatus_Mask_Type) || ++#endif + (field_mask & osl_FileStatus_Mask_Attributes) || + (field_mask & osl_FileStatus_Mask_CreationTime) || + (field_mask & osl_FileStatus_Mask_AccessTime) || +@@ -267,7 +284,11 @@ namespace /* private */ + if ((NULL == Item) || (NULL == pStat)) + return osl_File_E_INVAL; + ++#ifdef _DIRENT_HAVE_D_TYPE ++ file_path = rtl::OUString(reinterpret_cast(((oslDirectoryItemImpl* ) Item)->ustrFilePath)); ++#else + file_path = rtl::OUString(reinterpret_cast(Item)); ++#endif + + OSL_ASSERT(file_path.getLength() > 0); + +@@ -298,10 +319,18 @@ oslFileError SAL_CALL osl_getFileStatus( + #else + struct stat file_stat; + #endif +- if (is_stat_call_necessary(uFieldMask) && (0 != osl::lstat(file_path, file_stat))) ++ ++#ifdef _DIRENT_HAVE_D_TYPE ++ oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item; ++ bool bStatNeeded = is_stat_call_necessary(uFieldMask, pImpl); ++#else ++ bool bStatNeeded = is_stat_call_necessary(uFieldMask); ++#endif ++ ++ if (bStatNeeded && (0 != osl::lstat(file_path, file_stat))) + return oslTranslateFileError(OSL_FET_ERROR, errno); + +- if (is_stat_call_necessary(uFieldMask)) ++ if (bStatNeeded) + { + // we set all these attributes because it's cheap + set_file_type(file_stat, pStat); +@@ -318,6 +347,40 @@ oslFileError SAL_CALL osl_getFileStatus( + return osl_error; + } + } ++#ifdef _DIRENT_HAVE_D_TYPE ++ else if (uFieldMask & osl_FileStatus_Mask_Type) ++ { ++ OSL_ASSERT(pImpl->bHasType); ++ ++ switch(pImpl->DType) ++ { ++ case DT_LNK: ++ pStat->eType = osl_File_Type_Link; ++ break; ++ case DT_DIR: ++ pStat->eType = osl_File_Type_Directory; ++ break; ++ case DT_REG: ++ pStat->eType = osl_File_Type_Regular; ++ break; ++ case DT_FIFO: ++ pStat->eType = osl_File_Type_Fifo; ++ break; ++ case DT_SOCK: ++ pStat->eType = osl_File_Type_Socket; ++ break; ++ case DT_CHR: ++ case DT_BLK: ++ pStat->eType = osl_File_Type_Special; ++ break; ++ default: ++ OSL_ASSERT(0); ++ pStat->eType = osl_File_Type_Unknown; ++ } ++ ++ pStat->uValidFields |= osl_FileStatus_Mask_Type; ++ } ++#endif + + if (uFieldMask & osl_FileStatus_Mask_FileURL) + { +Index: sal/osl/unx/file_impl.hxx +=================================================================== +--- /dev/null 2006-01-10 21:26:33.568399000 +0100 ++++ openoffice.org/sal/osl/unx/file_impl.hxx 2006-01-17 20:05:30.000000000 +0100 +@@ -0,0 +1,18 @@ ++#ifdef __cplusplus ++extern "C" { ++#endif ++typedef struct ++{ ++ rtl_uString* ustrFilePath; /* holds native file name */ ++ unsigned char DType; ++ bool bHasType; ++ sal_uInt32 RefCount; ++} oslDirectoryItemImpl; ++ ++ oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType=0 ); ++ void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem ); ++ void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem ); ++ void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem ); ++#ifdef __cplusplus ++} /* extern "C" */ ++#endif Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1088 retrieving revision 1.1089 diff -u -r1.1088 -r1.1089 --- openoffice.org.spec 5 Mar 2007 08:39:37 -0000 1.1088 +++ openoffice.org.spec 5 Mar 2007 10:02:39 -0000 1.1089 @@ -1,6 +1,6 @@ %define oootag OOF680 %define ooomilestone 10 -%define rh_rpm_release 1 +%define rh_rpm_release 2 # gcc#19664# %define stlvisibilityfcked 1 @@ -124,6 +124,7 @@ Patch67: workspace.sixtyfour11.patch Patch68: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch Patch69: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch +Patch70: openoffice.org-2.2.0.ooo63159.sal.dtype.patch %define instdir %{_libdir}/openoffice.org @@ -1040,6 +1041,7 @@ %patch67 -p1 -b .workspace.sixtyfour11.patch %patch68 -p1 -b .gccXXXXX.solenv.javaregistration.patch %patch69 -p1 -b .ooo68717.gstreamer.video.patch +%patch70 -p1 -b .ooo63159.sal.dtype.patch cp %{SOURCE1} extras/source/database/evolocal.odb @@ -1070,7 +1072,7 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64" +export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics" #convert _smp_mflags to dmake equivalent SMP_MFLAGS=%{?_smp_mflags} SMP_MFLAGS=${SMP_MFLAGS/-j/-P} @@ -2585,6 +2587,10 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Mon Mar 05 2007 Caolan McNamara - 1:2.2.0-10.2 +- -fno-threadsafe-statics seeing as we're already double locked + http://people.redhat.com/caolanm/speed/threadsafe-statics.ods + * Sun Mar 04 2007 Caolan McNamara - 1:2.2.0-10.1 - next release candidate - drop d_type patch, no perceptable difference in performance From fedora-cvs-commits at redhat.com Mon Mar 5 10:28:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 05:28:03 -0500 Subject: rpms/fonts-indic/devel .cvsignore, 1.18, 1.19 fonts-indic.spec, 1.25, 1.26 sources, 1.22, 1.23 Message-ID: <200703051028.l25AS3N1008150@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-indic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8134 Modified Files: .cvsignore fonts-indic.spec sources Log Message: * Mon Mar 05 2007 Parag Nemade - 2.1.4 - Resolved Bugs from Parag Nemade - Bug 221383: [kn_IN] GSUB combinations has problem with Ra Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 19 Feb 2007 07:28:01 -0000 1.18 +++ .cvsignore 5 Mar 2007 10:28:01 -0000 1.19 @@ -15,3 +15,4 @@ fonts-indic-2.0.13.tar.gz fonts-indic-2.1.2.tar.gz fonts-indic-2.1.3.tar.gz +fonts-indic-2.1.4.tar.gz Index: fonts-indic.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/fonts-indic.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- fonts-indic.spec 19 Feb 2007 07:28:01 -0000 1.25 +++ fonts-indic.spec 5 Mar 2007 10:28:01 -0000 1.26 @@ -3,7 +3,7 @@ %define langlist "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu" Name: fonts-indic -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} License: GPL Group: User Interface/X @@ -267,6 +267,10 @@ %{xfontdir}/telugu/*ttf %changelog +* Mon Mar 05 2007 Parag Nemade - 2.1.4 +- Resolved Bugs from Parag Nemade +- Bug 221383: [kn_IN] GSUB combinations has problem with Ra + * Mon Feb 19 2007 Parag Nemade - 2.1.3-1 - Resolved Bugs from Parag Nemade - Bug 202401: [ta_IN] New codepoints/glyphs in Unicode 5.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 19 Feb 2007 07:28:02 -0000 1.22 +++ sources 5 Mar 2007 10:28:01 -0000 1.23 @@ -1,2 +1 @@ -68433fe4b18edda39373d3c42226d6eb fonts-indic-2.1.2.tar.gz -60f53848d13ab5895ad1128be4ec9e64 fonts-indic-2.1.3.tar.gz +b18c0cd089a396ba62694355d9902f1f fonts-indic-2.1.4.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 5 10:34:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 05:34:37 -0500 Subject: rpms/vixie-cron/devel vixie-cron.spec,1.90,1.91 Message-ID: <200703051034.l25AYbWS024002@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23852 Modified Files: vixie-cron.spec Log Message: Change in spec for review. Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- vixie-cron.spec 28 Feb 2007 12:56:25 -0000 1.90 +++ vixie-cron.spec 5 Mar 2007 10:34:34 -0000 1.91 @@ -10,7 +10,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times Name: vixie-cron Version: 4.1 -Release: 75%{?dist} +Release: 76%{?dist} Epoch: 4 License: BSD Group: System Environment/Base @@ -101,7 +101,9 @@ Buildrequires: audit-libs-devel >= 1.4.1 %endif -Requires: /sbin/chkconfig /etc/init.d /sbin/service +Requires(post): /sbin/chkconfig /etc/init.d /sbin/service +Requires(postun): /sbin/chkconfig /etc/init.d /sbin/service +Requires(preun): /sbin/chkconfig /etc/init.d /sbin/service %description The vixie-cron package contains the Vixie version of cron. Cron is a @@ -201,18 +203,21 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin} +#mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin} +mkdir -p $RPM_BUILD_ROOT/%{_bindir} +mkdir -p $RPM_BUILD_ROOT/%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5,8} -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -mkdir -p $RPM_BUILD_ROOT/etc/pam.d -make install DESTDIR=$RPM_BUILD_ROOT DESTMAN=$RPM_BUILD_ROOT%{_mandir} -mkdir -p $RPM_BUILD_ROOT/var/spool/cron -chmod 700 $RPM_BUILD_ROOT/var/spool/cron -mkdir -p $RPM_BUILD_ROOT/etc/cron.d -chmod 755 $RPM_BUILD_ROOT/etc/cron.d -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d +make install -p DESTDIR=$RPM_BUILD_ROOT DESTMAN=$RPM_BUILD_ROOT%{_mandir} +mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron +chmod 700 $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d +chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d +install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond +chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/crond mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ -cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond %if ! %{WITH_PAM} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/pam.d %endif @@ -249,13 +254,16 @@ %{_mandir}/man1/crontab.* %attr(700,root,root) %dir /var/spool/cron %attr(700,root,root) %dir /etc/cron.d -%attr(755,daemon,daemon) /etc/rc.d/init.d/crond +%attr(755,root,root) /etc/rc.d/init.d/crond %if %{WITH_PAM} %config(noreplace) /etc/pam.d/crond %endif %config(noreplace) /etc/sysconfig/crond %changelog +* Mon Mar 05 2007 Marcela Maslanova - 4:4.1-76 +- rhbz#226529 merge review + * Wed Feb 28 2007 Marcela Maslanova - 4:4.1-75 - rhbz#226529 merge review From fedora-cvs-commits at redhat.com Mon Mar 5 11:05:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 06:05:38 -0500 Subject: rpms/privoxy/devel privoxy-3.0.6-dynamic-pcre.patch, NONE, 1.1 privoxy-3.0.6-kill.patch, NONE, 1.1 privoxy.spec, 1.18, 1.19 Message-ID: <200703051105.l25B5crW007394@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/privoxy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7292 Modified Files: privoxy.spec Added Files: privoxy-3.0.6-dynamic-pcre.patch privoxy-3.0.6-kill.patch Log Message: - add upstream patch for dynamic pcre (#226316) - use kill -s HUP instead of 'kill -HUP' (#193159) privoxy-3.0.6-dynamic-pcre.patch: filters.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 45 insertions(+), 6 deletions(-) --- NEW FILE privoxy-3.0.6-dynamic-pcre.patch --- diff -urN privoxy-3.0.6-stable/filters.c privoxy-3.0.6-stable_new/filters.c --- privoxy-3.0.6-stable/filters.c 2006-09-23 15:26:38.000000000 +0200 +++ privoxy-3.0.6-stable_new/filters.c 2007-03-05 11:55:37.000000000 +0100 @@ -1489,7 +1489,9 @@ { if (strcmp(b->name, filtername->str) == 0) { - int current_hits = 0; + int current_hits = 0; /* Number of hits caused by this filter */ + int job_number = 0; /* Which job we're currently executing */ + int job_hits = 0; /* How many hits the current job caused */ if ( NULL == b->joblist ) { @@ -1501,13 +1503,50 @@ /* Apply all jobs from the joblist */ for (job = b->joblist; NULL != job; job = job->next) { - current_hits += pcrs_execute(job, old, size, &new, &size); - if (old != csp->iob->cur) free(old); - old=new; + job_number++; + job_hits = pcrs_execute(job, old, size, &new, &size); + + if (job_hits >= 0) + { + /* + * That went well. Continue filtering + * and use the result of this job as + * input for the next one. + */ + current_hits += job_hits; + if (old != csp->iob->cur) + { + free(old); + } + old = new; + } + else + { + /* + * The job caused an unexpected error. Inform the user + * and skip the rest of jobs in this filter. We could + * continue with the next job, but usually the jobs + * depend on each other or are similar enough to + * fail with the same reason. + * + * XXX: In theory pcrs_strerror() would + * return a proper error message here. + * + * At the moment, however, our pcrs expects the + * error codes of pcre 3.4 and newer pcre version + * return different error codes. As a result + * pcrs_strerror()'s error message might be bogus, + * therefore we print the numerical value as well. + */ + log_error(LOG_LEVEL_ERROR, "Skipped filter \'%s\' after job number %u: %s (%d)", + b->name, job_number, pcrs_strerror (job_hits), job_hits); + break; + } } - log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) with filter %s produced %d hits (new size %d).", - csp->http->hostport, csp->http->path, prev_size, b->name, current_hits, size); + log_error(LOG_LEVEL_RE_FILTER, + "re_filtering %s%s (size %d) with filter %s produced %d hits (new size %d).", + csp->http->hostport, csp->http->path, prev_size, b->name, current_hits, size); hits += current_hits; } privoxy-3.0.6-kill.patch: privoxy.init | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE privoxy-3.0.6-kill.patch --- --- privoxy-3.0.6-stable_new/privoxy.init.kill 2007-03-05 12:01:00.000000000 +0100 +++ privoxy-3.0.6-stable_new/privoxy.init 2007-03-05 12:01:15.000000000 +0100 @@ -95,7 +95,7 @@ ;; reload) if [ -f $PRIVOXY_PID ] ; then - kill -HUP `cat $PRIVOXY_PID` + kill -s HUP `cat $PRIVOXY_PID` RETVAL=$? fi ;; Index: privoxy.spec =================================================================== RCS file: /cvs/dist/rpms/privoxy/devel/privoxy.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- privoxy.spec 26 Feb 2007 10:16:10 -0000 1.18 +++ privoxy.spec 5 Mar 2007 11:05:36 -0000 1.19 @@ -4,12 +4,14 @@ Name: privoxy Version: 3.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Privoxy - privacy enhancing proxy License: GPL Source0: http://dl.sf.net/ijbswa/%{name}/%{name}-%{version}-stable-src.tar.gz Patch: privoxy-3.0.3-service.patch Patch1: privoxy-3.0.6-stripchangelog.patch +Patch2: privoxy-3.0.6-dynamic-pcre.patch +Patch3: privoxy-3.0.6-kill.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: System Environment/Daemons URL: http://www.privoxy.org/ @@ -33,6 +35,8 @@ %setup -q -n %{name}-%{version}-stable %patch -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build rm -rf autom4te.cache @@ -114,6 +118,10 @@ %doc doc/webserver %changelog +* Mon Mar 05 2007 Karsten Hopp 3.0.6-6 +- add upstream patch for dynamic pcre (#226316) +- use kill -s HUP instead of 'kill -HUP' (#193159) + * Mon Feb 26 2007 Karsten Hopp 3.0.6-5 - add disttag - don't convert manpage to UTF-8 From fedora-cvs-commits at redhat.com Mon Mar 5 12:23:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 07:23:11 -0500 Subject: rpms/gzip/devel .cvsignore, 1.7, 1.8 gzip.spec, 1.35, 1.36 sources, 1.7, 1.8 Message-ID: <200703051223.l25CNBHE004102@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gzip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4081 Modified Files: .cvsignore gzip.spec sources Log Message: - update to 1.3.11 remove uncompress Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gzip/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 Feb 2007 10:14:52 -0000 1.7 +++ .cvsignore 5 Mar 2007 12:23:09 -0000 1.8 @@ -1 +1 @@ -gzip-1.3.10.tar.gz +gzip-1.3.11.tar.gz Index: gzip.spec =================================================================== RCS file: /cvs/dist/rpms/gzip/devel/gzip.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- gzip.spec 6 Feb 2007 10:26:26 -0000 1.35 +++ gzip.spec 5 Mar 2007 12:23:09 -0000 1.36 @@ -1,6 +1,6 @@ Summary: The GNU data compression program Name: gzip -Version: 1.3.10 +Version: 1.3.11 Release: 1%{?dist} License: GPL Group: Applications/File @@ -68,6 +68,8 @@ # we don't ship it, so let's remove it from ${RPM_BUILD_ROOT} rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir +# uncompress is a part of ncompress package +rm -f ${RPM_BUILD_ROOT}/bin/uncompress %clean rm -rf ${RPM_BUILD_ROOT} @@ -89,6 +91,10 @@ %{_infodir}/gzip.info* %changelog +* Mon Mar 5 2007 Ivana Varekova - 1.3.11-1 +- update to 1.3.11 + remove uncompress + * Tue Feb 6 2007 Ivana Varekova - 1.3.10-1 - Resolves: 225878 update to 1.3.10 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gzip/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 6 Feb 2007 10:14:52 -0000 1.7 +++ sources 5 Mar 2007 12:23:09 -0000 1.8 @@ -1 +1 @@ -8b6f74a5060f984dceb0fee877aed854 gzip-1.3.10.tar.gz +a41a6a4b11f941cb7fc13df320f3af5f gzip-1.3.11.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 5 13:05:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 08:05:26 -0500 Subject: rpms/kdeadmin/devel ksysvrc, NONE, 1.1 kuserrc, NONE, 1.1 kdeadmin.spec, 1.67, 1.68 Message-ID: <200703051305.l25D5QUW002815@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeadmin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2479 Modified Files: kdeadmin.spec Added Files: ksysvrc kuserrc Log Message: cleanup specfile --- NEW FILE ksysvrc --- [Other Settings] Configured=true [Path Settings] RunlevelPath=/etc/rc.d ScriptPath=/etc/rc.d/init.d [Runlevels] Show Runlevels=0,1,2,3,4,5,6 --- NEW FILE kuserrc --- [template] copySkel=true createHomeDir=true homeBase=/home shell=/bin/bash userPrivateGroup=true Index: kdeadmin.spec =================================================================== RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- kdeadmin.spec 7 Feb 2007 22:34:22 -0000 1.67 +++ kdeadmin.spec 5 Mar 2007 13:05:24 -0000 1.68 @@ -1,102 +1,63 @@ %define rhel 0 -%define debug 0 -%define final 0 %define make_cvs 1 -%define ksysv 0 -%if %{rhel} -%define kuser 0 -%else -%define kuser 1 -%endif - -%define kpackage 0 -%define lilo 0 -%define kdat 1 -%define kcron 1 -%define arts 1 -%define knetworkconf 1 - %define qt_version 3.3.7 %define kdelibs_epoch 6 %define kdebase_epoch 6 -%define appdir %{_datadir}/applications/kde Version: 3.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdeadmin Summary: Administrative tools for KDE. Epoch: 7 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL +URL: http://www.kde.org/ -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Source1: kuser.pam Source2: kuser.pamd Source3: kpackage.pam Source4: kpackage.pamd Source5: kpackagerc +Source6: ksysvrc +Source7: kuserrc Patch0: kdeadmin-3.5.6-knetworkconf-fc-6.patch -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -Requires: kdelibs >= %{kdelibs_epoch}:%{version} Requires: kdebase >= %{kdebase_epoch}:%{version} -Requires: usermode +Requires: kdelibs >= %{kdelibs_epoch}:%{version} +Requires: pkgconfig +Requires(post): xdg-utils +Requires(postun): xdg-utils -BuildRequires: desktop-file-utils +%if %{make_cvs} BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: zlib-devel -BuildRequires: kdelibs-devel >= %{version} -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel +%endif +BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version} BuildRequires: rpm-devel -BuildRequires: bzip2-devel -BuildRequires: perl %description The kdeadmin package includes administrative tools for the K Desktop Environment (KDE) including: - - kcron - Crontab editor - kdat - Tape backup tool - kuser - Frontend for configuring users and user groups +kcron, kdat, knetworkconf, kpackage, ksysv, kuser. %prep %setup -q + %patch0 -p1 -b .fc6 -%if ! %{kpackage} +if %{rhel} echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in -%endif - -%if ! %{ksysv} echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"' >ksysv/configure.in.in -%endif - -%if ! %{kuser} echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kuser"' >kuser/configure.in.in -%endif - -%if ! %{lilo} echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE lilo-config"' >lilo-config/configure.in.in %endif -%if ! %{kdat} - echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kdat"' >kdat/configure.in.in -%endif - -%if ! %{kcron} - echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kcron"' >kcron/configure.in.in -%endif - -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" ksysv/Makefile* lilo-config/qt/Makefile.* - %if %{make_cvs} make -f admin/Makefile.common cvs %endif @@ -111,16 +72,7 @@ --with-rpm \ --with-qt-libraries=$QTDIR/lib \ --disable-gcc-hidden-visibility \ -%if %{arts} == 0 - --without-arts \ -%endif -%if %{final} --enable-final \ -%endif -%if %{debug} - --enable-debug \ - --disable-warnings \ -%endif --with-private-groups make %{?_smp_mflags} @@ -130,194 +82,84 @@ make install DESTDIR=%{buildroot} -# don't use, just delete. Our own versions come later. -rm -rf %{buildroot}/etc/pam.d %{buildroot}/etc/security +%if %{rhel} +comps="kcron kdat knetworkconf" +%else +comps="kcron kdat knetworkconf kpackage ksysv kuser" +mkdir -p %{buildroot}%{_datadir}/config +install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/ +# Run kuser through consolehelper +install -c -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser +install -c -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser +mv %{buildroot}%{_bindir}/kuser %{buildroot}/usr/sbin +ln -s consolehelper %{buildroot}%{_bindir}/kuser +# Run kpackage through consolehelper +install -c -m 644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage +install -m 0644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage +mv %{buildroot}%{_bindir}/kpackager %{buildroot}/usr/sbin +ln -s consolehelper %{buildroot}%{_bindir}/kpackager +%endif + +# locale's +%find_lang %{name} || touch %{name}.lang +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}/$HTML_DIR ]; then +for lang_dir in %{buildroot}/$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi -# fix absolute symbolic links -( - rpmlist="kcron" - %if %{ksysv} - rpmlist="$rpmlist ksysv" - %endif - %if %{kuser} - rpmlist="$rpmlist kuser" - %endif - mkdir -p %{buildroot}%{_docdir}/HTML/en/common - cd %{buildroot}%{_docdir}/HTML/en - for i in $rpmlist ; do - cd $i && ln -nfs ../common . - cd .. +# rpmdocs +for dir in $comps ; do + for file in AUTHORS ChangeLog README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" done -) - -%if %{kuser} - desktop-file-install \ - --vendor "" \ - --dir %{buildroot}%{appdir} \ - --delete-original \ - --add-only-show-in KDE \ - %{buildroot}%{appdir}/kuser.desktop -# Put in some sane defaults - mkdir -p %{buildroot}%{_datadir}/config - cat >%{buildroot}%{_datadir}/config/kuserrc <%{buildroot}%{_datadir}/config/ksysvrc < /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %postun -for icon_theme in crystalsvg hicolor locolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root) -%{_bindir}/secpolicy -%{_libdir}/kde3/kfile_* -%{_datadir}/services/kfile_* - -%if %{knetworkconf} -%{_libdir}/kde3/kcm_knetwork* -%{_libdir}/pkgconfig/system-tools-backends.pc -%{_datadir}/applications/kde/kcm_knetwork*.desktop -%{_datadir}/apps/knetworkconf -%{_datadir}/icons/*/*/*/*network*.png -%doc %{_docdir}/HTML/en/knetworkconf -%endif - -%if %{kcron} -%{_bindir}/kcron -%{_datadir}/applications/kde/*kcron.desktop -%{_datadir}/icons/*/*/apps/kcron* -%{_datadir}/apps/kcron -%doc %{_docdir}/HTML/en/kcron -%endif - -%if %{kdat} -%{_bindir}/kdat -%{_datadir}/apps/kdat -%{_datadir}/applications/kde/*kdat.desktop -%{_datadir}/icons/*/*/*/kdat.png -%doc %{_docdir}/HTML/en/kdat -%endif - -%if %{kpackage} -%config %{_datadir}/config/kpackagerc -%config %{_datadir}/apps/kpackage/kpackageui.rc -%{_bindir}/kpackage -%{_sbindir}/kpackage -%{_datadir}/apps/kpackage -%{_datadir}/applications/kde/*kpackage.desktop -%{_datadir}/icons/*/*/apps/kpackage* -%{_datadir}/mimelnk/application/x-debian-package.desktop -%config(noreplace) /etc/pam.d/kpackage -%config(noreplace) /etc/security/console.apps/kpackage -%doc %{_docdir}/HTML/en/kpackage -%endif - -%if %{ksysv} -%config %{_datadir}/config/ksysvrc -%{_bindir}/ksysv -%{_datadir}/apps/ksysv -%{_datadir}/applications/kde/*ksysv.desktop -%{_datadir}/icons/*/*/apps/ksysv* -%{_datadir}/mimelnk/application/x-ksysv.desktop -%{_datadir}/mimelnk/text/x-ksysv-log.desktop -%{_datadir}/icons/*/*/actions/toggle_log.png -%doc %{_docdir}/HTML/en/ksysv -%endif - -%if %{kuser} -%config %{_datadir}/config/kuserrc -%{_bindir}/kuser -%{_sbindir}/kuser -%{_datadir}/apps/kuser -%{_datadir}/applications/kde/*kuser.desktop -%{_datadir}/icons/*/*/apps/kuser* -%{_datadir}/config.kcfg/kuser.kcfg -%config(noreplace) /etc/pam.d/kuser -%config(noreplace) /etc/security/console.apps/kuser -%doc %{_docdir}/HTML/en/kuser -%endif - -%if %{lilo} -%{_datadir}/applications/kde/*lilo.desktop -%{_libdir}/kde3/kcm_lilo* -%endif +%doc AUTHORS COPYING README +%doc rpmdocs/* +%{_bindir}/* +%{_datadir}/apps/* +%{_datadir}/applications/kde/*.desktop +%config(noreplace) %{_datadir}/config*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/service*/*.desktop +%{_libdir}/kde3/*.[ls][ao] +%{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 05 2007 Than Ngo - 7:3.5.6-2.fc7 +- cleanup specfiles + * Wed Feb 07 2007 Than Ngo 7:3.5.6-1.fc7 - 3.5.6 From fedora-cvs-commits at redhat.com Mon Mar 5 13:07:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 08:07:05 -0500 Subject: rpms/kdeadmin/devel kdeadmin.spec,1.68,1.69 Message-ID: <200703051307.l25D75qT004082@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeadmin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3941 Modified Files: kdeadmin.spec Log Message: cleanup specfile Index: kdeadmin.spec =================================================================== RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- kdeadmin.spec 5 Mar 2007 13:05:24 -0000 1.68 +++ kdeadmin.spec 5 Mar 2007 13:07:03 -0000 1.69 @@ -153,7 +153,7 @@ %{_datadir}/icons/locolor/*/*/* %{_datadir}/mimelnk/*/*.desktop %{_datadir}/service*/*.desktop -%{_libdir}/kde3/*.[ls][ao] +%{_libdir}/kde3/* %{_libdir}/pkgconfig/*.pc %changelog From fedora-cvs-commits at redhat.com Mon Mar 5 13:07:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 08:07:36 -0500 Subject: rpms/kdeadmin/devel kdeadmin.spec,1.69,1.70 Message-ID: <200703051307.l25D7akZ004524@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeadmin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4408 Modified Files: kdeadmin.spec Log Message: typo Index: kdeadmin.spec =================================================================== RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- kdeadmin.spec 5 Mar 2007 13:07:03 -0000 1.69 +++ kdeadmin.spec 5 Mar 2007 13:07:34 -0000 1.70 @@ -51,7 +51,7 @@ %patch0 -p1 -b .fc6 -if %{rhel} +%if %{rhel} echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"' >ksysv/configure.in.in echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kuser"' >kuser/configure.in.in From fedora-cvs-commits at redhat.com Mon Mar 5 13:52:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 08:52:50 -0500 Subject: rpms/kdeadmin/devel kdeadmin.spec,1.70,1.71 Message-ID: <200703051352.l25DqodD006715@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeadmin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6698 Modified Files: kdeadmin.spec Log Message: cleanup Index: kdeadmin.spec =================================================================== RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- kdeadmin.spec 5 Mar 2007 13:07:34 -0000 1.70 +++ kdeadmin.spec 5 Mar 2007 13:52:48 -0000 1.71 @@ -84,9 +84,14 @@ %if %{rhel} comps="kcron kdat knetworkconf" +rm -rf %{buildroot}%{_docdir}/HTML/en/kuser \ + %{buildroot}%{_docdir}/HTML/en/kpackage \ + %{buildroot}%{_docdir}/HTML/en/ksysv \ + %{buildroot}%{_docdir}/HTML/en/lilo-config %else comps="kcron kdat knetworkconf kpackage ksysv kuser" mkdir -p %{buildroot}%{_datadir}/config +mkdir -p %{buildroot}/etc/security/console.apps install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/ # Run kuser through consolehelper install -c -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser @@ -145,6 +150,11 @@ %doc AUTHORS COPYING README %doc rpmdocs/* %{_bindir}/* +%if !%{rhel} +%{_sbindir}/* +%config(noreplace) /etc/pam.d/* +%config(noreplace) /etc/security/console.apps/* +%endif %{_datadir}/apps/* %{_datadir}/applications/kde/*.desktop %config(noreplace) %{_datadir}/config*/* From fedora-cvs-commits at redhat.com Mon Mar 5 14:38:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 09:38:47 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1089, 1.1090 openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch, 1.1, NONE Message-ID: <200703051438.l25EclgM022493@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22388 Modified Files: openoffice.org.spec Removed Files: openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch Log Message: remove openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1089 retrieving revision 1.1090 diff -u -r1.1089 -r1.1090 --- openoffice.org.spec 5 Mar 2007 10:02:39 -0000 1.1089 +++ openoffice.org.spec 5 Mar 2007 14:38:45 -0000 1.1090 @@ -115,16 +115,15 @@ Patch58: workspace.cmcfixes32.patch Patch59: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch Patch60: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch -Patch61: openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch -Patch62: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch -Patch63: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch -Patch64: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch -Patch65: openoffice.org-2.2.0.ooo74401.basctl.boost.patch -Patch66: workspace.configrefactor01.patch -Patch67: workspace.sixtyfour11.patch -Patch68: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch -Patch69: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch -Patch70: openoffice.org-2.2.0.ooo63159.sal.dtype.patch +Patch61: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch +Patch62: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch +Patch63: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch +Patch64: openoffice.org-2.2.0.ooo74401.basctl.boost.patch +Patch65: workspace.configrefactor01.patch +Patch66: workspace.sixtyfour11.patch +Patch67: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch +Patch68: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch +Patch69: openoffice.org-2.2.0.ooo63159.sal.dtype.patch %define instdir %{_libdir}/openoffice.org @@ -1032,16 +1031,15 @@ %patch58 -p1 -b .workspace.cmcfixes32.patch %patch59 -p1 -b .ooo73863.vcl.imcommit.patch %patch60 -p1 -b .ooo73974.bridges.doublereturn.patch -%patch61 -p1 -b .oooXXXXX.atkthreads.atexit.patch -%patch62 -p1 -b .ooo74188.sw.cursorinsideglyph.patch -%patch63 -p1 -b .ooo74255.vcl.depth.mismatch.patch -%patch64 -p1 -b .ooo74451.sw.typemismatch.patch -%patch65 -p1 -b .ooo74401.basctl.boost.patch -%patch66 -p1 -b .workspace.configrefactor01.patch -%patch67 -p1 -b .workspace.sixtyfour11.patch -%patch68 -p1 -b .gccXXXXX.solenv.javaregistration.patch -%patch69 -p1 -b .ooo68717.gstreamer.video.patch -%patch70 -p1 -b .ooo63159.sal.dtype.patch +%patch61 -p1 -b .ooo74188.sw.cursorinsideglyph.patch +%patch62 -p1 -b .ooo74255.vcl.depth.mismatch.patch +%patch63 -p1 -b .ooo74451.sw.typemismatch.patch +%patch64 -p1 -b .ooo74401.basctl.boost.patch +%patch65 -p1 -b .workspace.configrefactor01.patch +%patch66 -p1 -b .workspace.sixtyfour11.patch +%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch +%patch68 -p1 -b .ooo68717.gstreamer.video.patch +%patch69 -p1 -b .ooo63159.sal.dtype.patch cp %{SOURCE1} extras/source/database/evolocal.odb @@ -2590,6 +2588,7 @@ * Mon Mar 05 2007 Caolan McNamara - 1:2.2.0-10.2 - -fno-threadsafe-statics seeing as we're already double locked http://people.redhat.com/caolanm/speed/threadsafe-statics.ods +- drop openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch, atk fixed * Sun Mar 04 2007 Caolan McNamara - 1:2.2.0-10.1 - next release candidate --- openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 5 14:46:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 09:46:35 -0500 Subject: rpms/privoxy/devel privoxy.spec,1.19,1.20 Message-ID: <200703051446.l25EkZ40003015@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/privoxy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2970 Modified Files: privoxy.spec Log Message: rpmlint fixes Index: privoxy.spec =================================================================== RCS file: /cvs/dist/rpms/privoxy/devel/privoxy.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- privoxy.spec 5 Mar 2007 11:05:36 -0000 1.19 +++ privoxy.spec 5 Mar 2007 14:46:33 -0000 1.20 @@ -4,7 +4,7 @@ Name: privoxy Version: 3.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Privoxy - privacy enhancing proxy License: GPL Source0: http://dl.sf.net/ijbswa/%{name}/%{name}-%{version}-stable-src.tar.gz @@ -102,8 +102,6 @@ %files %defattr(-,%{name},%{name},-) -%dir %{privoxyconf} -%dir %{privoxyconf}/templates %dir %{_localstatedir}/log/%{name} %attr(0744,%{name},%{name})%{_sbindir}/%{name} %config(noreplace) %{privoxyconf} @@ -118,6 +116,9 @@ %doc doc/webserver %changelog +* Mon Mar 05 2007 Karsten Hopp 3.0.6-7 +- rpmlint fixes + * Mon Mar 05 2007 Karsten Hopp 3.0.6-6 - add upstream patch for dynamic pcre (#226316) - use kill -s HUP instead of 'kill -HUP' (#193159) @@ -452,7 +453,7 @@ - Added preun section to stop the service with the old name, as well as remove it from the startup list - Removed the chkconfig --del entry from the conditional block on - the preun scriptlet (now handled on the %files section) + the preun scriptlet (now handled on the %%files section) * Thu Mar 21 2002 Hal Burgiss - added ijb_docs.css to docs. From fedora-cvs-commits at redhat.com Mon Mar 5 14:52:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 09:52:36 -0500 Subject: rpms/brltty/devel brltty-3.7.2-yacc-buildfix.patch, NONE, 1.1 brltty.spec, 1.22, 1.23 Message-ID: <200703051452.l25EqaVZ000572@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/brltty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv523 Modified Files: brltty.spec Added Files: brltty-3.7.2-yacc-buildfix.patch Log Message: * Mon Mar 05 2007 Tomas Janousek - 3.7.2-3 - added the XWindow driver - build fix for newer byacc brltty-3.7.2-yacc-buildfix.patch: config.y | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE brltty-3.7.2-yacc-buildfix.patch --- --- brltty-3.7.2/BrailleDrivers/Papenmeier/config.y.yacc-buildfix 2005-12-26 13:57:44.000000000 +0100 +++ brltty-3.7.2/BrailleDrivers/Papenmeier/config.y 2007-03-05 15:31:27.000000000 +0100 @@ -41,7 +41,7 @@ #define YYERROR_VERBOSE static int yylex(void); static int yyerror(char*); -static int yyparse(); +/*static*/ int yyparse(); /* to be called: */ static int parse (void); Index: brltty.spec =================================================================== RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- brltty.spec 30 Jan 2007 12:32:40 -0000 1.22 +++ brltty.spec 5 Mar 2007 14:52:34 -0000 1.23 @@ -1,6 +1,6 @@ Name: brltty Version: 3.7.2 -Release: 2.1%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://mielke.cc/brltty/ @@ -8,6 +8,7 @@ Patch0: brltty-3.7.2-linux-compiler-h.patch Patch1: brltty-3.7.2-vt-buildfix.patch Patch2: brltty-3.7.2-debuginfo.patch +Patch3: brltty-3.7.2-yacc-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot Summary: Braille display driver for Linux/Unix. Requires(post): coreutils @@ -21,6 +22,14 @@ and provides complete screen review functionality. Some speech capability has also been incorporated. +%package xw +Requires: %{name} +Summary: XWindow driver for BRLTTY. +Group: System Environment/Daemons +BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel +%description xw +This package provides the XWindow driver for BRLTTY. + %package -n brlapi Version: 0.4.1 Group: Applications/System @@ -57,6 +66,7 @@ %patch0 -p1 -b .linux-compiler-h %patch1 -p1 -b .vt-buildfix %patch2 -p1 -b .debuginfo +%patch3 -p1 -b .yacc-buildfix %build %configure --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt @@ -73,6 +83,9 @@ install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" rm -f ${RPM_BUILD_ROOT}/usr/bin/xbrlapi # whatever this is, we exclude it for now +ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | grep -v 'libbrlttybxw.so' | \ + sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist + %clean rm -rf $RPM_BUILD_ROOT @@ -97,12 +110,12 @@ fi exit 0 -%files +%files -f libs.filelist %defattr(-,root,root) %config(noreplace) /etc/brltty.conf %{_bindir}/brltty %{_bindir}/brltty-* -%{_libdir}/brltty +%dir %{_libdir}/brltty /etc/brltty %doc COPYING %doc Documents/ChangeLog Documents/TODO @@ -110,6 +123,9 @@ %doc doc/* %doc /usr/share/man/man1/* +%files xw +%{_libdir}/brltty/libbrlttybxw.so + %files -n brlapi %defattr(-,root,root) %{_libdir}/libbrlapi.so.* @@ -124,7 +140,12 @@ %doc %{_mandir}/man3/* %doc Documents/BrlAPIref-HTML + %changelog +* Mon Mar 05 2007 Tomas Janousek - 3.7.2-3 +- added the XWindow driver +- build fix for newer byacc + * Tue Jan 30 2007 Tomas Janousek - 3.7.2-2.1 - quiet postinstall scriptlet, really fixes #224570 From fedora-cvs-commits at redhat.com Mon Mar 5 15:12:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 10:12:09 -0500 Subject: rpms/vnc/devel .cvsignore, 1.21, 1.22 sources, 1.22, 1.23 vnc-always_use_fb.patch, 1.1, 1.2 vnc.spec, 1.169, 1.170 Message-ID: <200703051512.l25FC9Qt015465@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/vnc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15034/vnc/devel Modified Files: .cvsignore sources vnc-always_use_fb.patch vnc.spec Log Message: - removed xserver tarball from sources - fixed minor screen defects on 64bits Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 15 Nov 2006 11:32:27 -0000 1.21 +++ .cvsignore 5 Mar 2007 15:12:02 -0000 1.22 @@ -1,3 +1,2 @@ -xorg-server-1.1.1.tar.bz2 vnc-4_1_2-unixsrc.tar.gz vnc-4_1-javasrc.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 15 Nov 2006 11:32:27 -0000 1.22 +++ sources 5 Mar 2007 15:12:02 -0000 1.23 @@ -1,3 +1,2 @@ -a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 cf9a6fe8f592286b5e0fdde686504ffb vnc-4_1_2-unixsrc.tar.gz 9407ce1f215aefca77bef12670745280 vnc-4_1-javasrc.tar.gz vnc-always_use_fb.patch: xvnc.cc | 141 ++++++++++------------------------------------------------------ 1 files changed, 23 insertions(+), 118 deletions(-) Index: vnc-always_use_fb.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-always_use_fb.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vnc-always_use_fb.patch 23 Feb 2007 16:54:37 -0000 1.1 +++ vnc-always_use_fb.patch 5 Mar 2007 15:12:02 -0000 1.2 @@ -1,5 +1,5 @@ ---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.always_use_fb 2007-02-23 16:27:53.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-02-23 17:39:33.000000000 +0100 +--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.always_use_fb 2007-03-05 14:03:21.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-05 14:10:57.000000000 +0100 @@ -33,27 +33,28 @@ #include #include "vncExtInit.h" @@ -64,7 +64,7 @@ } #define XVNCVERSION "Free Edition 4.1.2" -@@ -513,67 +502,6 @@ +@@ -502,67 +491,6 @@ } #endif @@ -132,7 +132,7 @@ static ColormapPtr InstalledMaps[MAXSCREENS]; static int vfbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) -@@ -843,44 +771,30 @@ +@@ -832,44 +760,32 @@ defaultColorVisualClass = (pvfb->bitsPerPixel > 8) ? TrueColor : PseudoColor; @@ -140,7 +140,8 @@ - if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, - dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel)) - return FALSE; -- ++ miSetPixmapDepths(); + -#ifdef RENDER - if (ret && Render) - fbPictureInit(pScreen, 0, 0); @@ -188,7 +189,7 @@ pScreen->InstallColormap = vfbInstallColormap; pScreen->UninstallColormap = vfbUninstallColormap; -@@ -926,18 +840,7 @@ +@@ -915,18 +831,7 @@ } } Index: vnc.spec =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- vnc.spec 2 Mar 2007 15:33:54 -0000 1.169 +++ vnc.spec 5 Mar 2007 15:12:02 -0000 1.170 @@ -4,7 +4,7 @@ Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 14%{?dist} +Release: 15%{?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 @@ -314,6 +314,10 @@ %{_libdir}/librfb.so.* %changelog +* Mon Mar 05 2007 Adam Tkac 4.1.2-15.fc7 +- improved vnc-always_use_fb patch (some screen defects on 64bits) +- removed xserver tarball from source list + * Fri Mar 02 2007 Adam Tkac 4.1.2-14.fc7 - enabled RENDER, Composite and GLX extensions by default on all architectures - new relation between Xvnc and xorg's source. Xvnc now uses latest xorg's sources From fedora-cvs-commits at redhat.com Mon Mar 5 15:19:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 10:19:38 -0500 Subject: rpms/kdeadmin/devel kdeadmin.spec,1.71,1.72 Message-ID: <200703051519.l25FJcYD014004@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeadmin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13907 Modified Files: kdeadmin.spec Log Message: cleanup Index: kdeadmin.spec =================================================================== RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- kdeadmin.spec 5 Mar 2007 13:52:48 -0000 1.71 +++ kdeadmin.spec 5 Mar 2007 15:19:36 -0000 1.72 @@ -90,18 +90,23 @@ %{buildroot}%{_docdir}/HTML/en/lilo-config %else comps="kcron kdat knetworkconf kpackage ksysv kuser" -mkdir -p %{buildroot}%{_datadir}/config -mkdir -p %{buildroot}/etc/security/console.apps +mkdir -p %{buildroot}%{_datadir}/config \ + %{buildroot}/etc/security/console.apps \ + %{buildroot}/etc/pam.d \ + %{buildroot}%{_sbindir} + install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/ + # Run kuser through consolehelper install -c -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser install -c -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser -mv %{buildroot}%{_bindir}/kuser %{buildroot}/usr/sbin +mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir} ln -s consolehelper %{buildroot}%{_bindir}/kuser + # Run kpackage through consolehelper install -c -m 644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage install -m 0644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage -mv %{buildroot}%{_bindir}/kpackager %{buildroot}/usr/sbin +mv %{buildroot}%{_bindir}/kpackage %{buildroot}%{_sbindir} ln -s consolehelper %{buildroot}%{_bindir}/kpackager %endif From fedora-cvs-commits at redhat.com Mon Mar 5 15:58:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 10:58:57 -0500 Subject: rpms/kdepim/devel kdepim.spec,1.119,1.120 Message-ID: <200703051558.l25FwvNF014770@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdepim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14756 Modified Files: kdepim.spec Log Message: cleanup Index: kdepim.spec =================================================================== RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- kdepim.spec 8 Feb 2007 16:46:36 -0000 1.119 +++ kdepim.spec 5 Mar 2007 15:58:55 -0000 1.120 @@ -7,10 +7,8 @@ %define arts_version 8:1.5.6 %define make_cvs 1 -%define appdir %{_datadir}/applications/kde - Version: 3.5.6 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdepim Summary: PIM (Personal Information Manager) for KDE Epoch: 6 @@ -136,8 +134,8 @@ for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \ KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do - if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then - echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop + if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then + echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop fi done @@ -160,6 +158,7 @@ %files %defattr(-,root,root) +%doc README korganizer/COPYING %{_bindir}/* %{_libdir}/lib*.so.* %{_libdir}/libakregatorprivate.so @@ -201,6 +200,9 @@ %exclude %{_libdir}/libremotekonnector.so %changelog +* Mon Mar 05 2007 Than Ngo 3.5.6-3.fc7 +- cleanup specfile + * Thu Feb 08 2007 Than Ngo - 6:3.5.6-2.fc7 - apply upstream patch to fix a debugging leftover which logs passwords clear text From fedora-cvs-commits at redhat.com Mon Mar 5 16:02:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 11:02:24 -0500 Subject: rpms/dhcp/devel README.ldap, NONE, 1.1 dhcp-3.0.5-no-win32.patch, NONE, 1.1 dhcpd-conf-to-ldap.pl, NONE, 1.1 draft-ietf-dhc-ldap-schema-01.txt, NONE, 1.1 linux.dbus-example, NONE, 1.1 dhcp-3.0.5-Makefile.patch, 1.2, 1.3 dhcp-3.0.5-extended-new-option-info.patch, 1.2, 1.3 dhcp-3.0.5-ldap-configuration.patch, 1.2, 1.3 dhcp.spec, 1.144, 1.145 Message-ID: <200703051602.l25G2OHT015008@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14995 Modified Files: dhcp-3.0.5-Makefile.patch dhcp-3.0.5-extended-new-option-info.patch dhcp-3.0.5-ldap-configuration.patch dhcp.spec Added Files: README.ldap dhcp-3.0.5-no-win32.patch dhcpd-conf-to-ldap.pl draft-ietf-dhc-ldap-schema-01.txt linux.dbus-example Log Message: * Thu Mar 01 2007 David Cantrell - 12:3.0.5-24 - Include contrib/ subdirectory in /usr/share/doc (#230476) - Added back Requires for perl since dhcpd-conf-to-ldap needs it (#225691) - Put copies of dhcp-options and dhcp-eval man pages in the dhcp and dhclient packages rather than having the elaborate symlink collection - Explicitly name man pages in the %files listings - Use the %{_sysconfdir} and %{_initrddir} macros (#225691) - Use macros for commands in %build and %install - Split README.ldap, draft-ietf-dhc-ldap-schema-01.txt, and dhcpd-conf-to-ldap.pl out of the LDAP patch - Split linux.dbus-example script out of the extended new option info patch - Remove unnecessary changes from the Makefile patch --- NEW FILE README.ldap --- LDAP Support in DHCP Brian Masney Last updated 8/16/2002 This document describes setting up the DHCP server to read it's configuration from LDAP. This work is based on the IETF document draft-ietf-dhc-ldap-schema-01.txt included in the doc directory. For the latest version of this document, please see http://home.ntelos.net/~masneyb. First question on most people's mind is "Why do I want to store my configuration in LDAP?" If you run a small DHCP server, and the configuration on it rarely changes, then you won't need to store your configuration in LDAP. But, if you have several DHCP servers, and you want an easy way to manage your configuration, this can be a solution. The first step will be to setup your LDAP server. I am using OpenLDAP from www.openldap.org. Building and installing OpenLDAP is beyond the scope of this document. There is plenty of documentation out there about this. Once you have OpenLDAP installed, you will have to edit your slapd.conf file. I added the following 2 lines to my configuration file: include /etc/ldap/schema/dhcp.schema index dhcpHWAddress eq index dhcpClassData eq The first line tells it to include the dhcp schema file. You will find this file under the contrib directory in this distribution. You will need to copy this file to where your other schema files are (maybe /usr/local/openldap/etc/openldap/schema/). The second line sets up an index for the dhcpHWAddress parameter. The third parameter is for reading subclasses from LDAP every time a DHCP request comes in. Make sure you run the slapindex command and restart slapd to have these changes to into effect. Now that you have LDAP setup, you should be able to use gq (http://biot.com/gq/) to verify that the dhcp schema file is loaded into LDAP. Pull up gq, and click on the Schema tab. Go under objectClasses, and you should see at least the following object classes listed: dhcpClass, dhcpGroup, dhcpHost, dhcpOptions, dhcpPool, dhcpServer, dhcpService, dhcpSharedNetwork, dhcpSubClass, and dhcpSubnet. If you do not see these, you need to check over your LDAP configuration before you go any further. You should be ready to build DHCP. Edit the includes/site.h file and uncomment the #define LDAP_CONFIGURATION. Now run configure in the base source directory. Edit the work.os/server/Makefile and add -lldap to the LIBS= line. (replace os with your operating system, linux-2.2 on my machine). You should be able to type make to build your DHCP server. Once you have DHCP installed, you will need to setup your initial plaintext config file. In my /etc/dhcpd.conf file, I have: ldap-server "localhost"; ldap-port 389; ldap-username "cn=DHCP User, dc=ntelos, dc=net"; ldap-password "blah"; ldap-base-dn "dc=ntelos, dc=net"; ldap-method dynamic; All of these parameters should be self explanatory except for the ldap-method. You can set this to static or dynamic. If you set it to static, the configuration is read once on startup, and LDAP isn't used anymore. But, if you set this to dynamic, the configuration is read once on startup, and the hosts that are stored in LDAP are looked up every time a DHCP request comes in. The next step is to set up your LDAP tree. Here is an example config that will give a 10.100.0.x address to machines that have a host entry in LDAP. Otherwise, it will give a 10.200.0.x address to them. (NOTE: replace dc=ntelos, dc=net with your base dn). If you would like to convert your existing dhcpd.conf file to LDIF format, there is a script contrib/dhcpd-conf-to-ldap.pl that will convert it for you. # You must specify the server's host name in LDAP that you are going to run # DHCP on and point it to which config tree you want to use. Whenever DHCP # first starts up, it will do a search for this entry to find out which # config to use dn: cn=brian.ntelos.net, dc=ntelos, dc=net objectClass: top objectClass: dhcpServer cn: brian.ntelos.net dhcpServiceDN: cn=DHCP Service Config, dc=ntelos, dc=net # Here is the config tree that brian.ntelos.net points to. dn: cn=DHCP Service Config, dc=ntelos, dc=net cn: DHCP Service Config objectClass: top objectClass: dhcpService dhcpPrimaryDN: dc=ntelos, dc=net dhcpStatements: ddns-update-style ad-hoc dhcpStatements: default-lease-time 600 dhcpStatements: max-lease-time 7200 # Set up a shared network segment dn: cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net cn: WV objectClass: top objectClass: dhcpSharedNetwork # Set up a subnet declaration with a pool statement. Also note that we have # a dhcpOptions object with this entry dn: cn=10.100.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net cn: 10.100.0.0 objectClass: top objectClass: dhcpSubnet objectClass: dhcpOptions dhcpOption: domain-name-servers 10.100.0.2 dhcpOption: routers 10.100.0.1 dhcpOption: subnet-mask 255.255.255.0 dhcpOption: broadcast-address 10.100.0.255 dhcpNetMask: 24 # Set up a pool for this subnet. Only known hosts will get these IPs dn: cn=Known Pool, cn=10.100.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net cn: Known Pool objectClass: top objectClass: dhcpPool dhcpRange: 10.100.0.3 10.100.0.254 dhcpPermitList: deny unknown-clients # Set up another subnet declaration with a pool statement dn: cn=10.200.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net cn: 10.200.0.0 objectClass: top objectClass: dhcpSubnet objectClass: dhcpOptions dhcpOption: domain-name-servers 10.200.0.2 dhcpOption: routers 10.200.0.1 dhcpOption: subnet-mask 255.255.255.0 dhcpOption: broadcast-address 10.200.0.255 dhcpNetMask: 24 # Set up a pool for this subnet. Only unknown hosts will get these IPs dn: cn=Known Pool, cn=10.200.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net cn: Known Pool objectClass: top objectClass: dhcpPool dhcpRange: 10.200.0.3 10.200.0.254 dhcpPermitList: deny known clients # Set aside a group for all of our known MAC addresses dn: cn=Customers, cn=DHCP Service Config, dc=ntelos, dc=net objectClass: top objectClass: dhcpGroup cn: Customers # Host entry for my laptop dn: cn=brianlaptop, cn=Customers, cn=DHCP Service Config, dc=ntelos, dc=net objectClass: top objectClass: dhcpHost cn: brianlaptop dhcpHWAddress: ethernet 00:00:00:00:00:00 You can use the command slapadd to load all of these entries into your LDAP server. After you load this, you should be able to start up DHCP. If you run into problems reading the configuration, try running dhcpd with the -d flag. If you still have problems, edit the site.conf file in the DHCP source and add the line: COPTS= -DDEBUG_LDAP and recompile DHCP. (make sure you run make clean and rerun configure before you rebuild). dhcp-3.0.5-no-win32.patch: Registry.pm | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE dhcp-3.0.5-no-win32.patch --- --- dhcp-3.0.5/contrib/ms2isc/Registry.pm.win32 2002-12-15 03:19:33.000000000 -0500 +++ dhcp-3.0.5/contrib/ms2isc/Registry.pm 2007-03-01 18:09:36.000000000 -0500 @@ -31,7 +31,10 @@ package Registry; use strict; -use Win32API::Registry 0.21 qw( :ALL ); + +# Uncomment the use Win32API line for this module to work. Make sure you have +# installed the libwin32 Perl module first. -- +#use Win32API::Registry 0.21 qw( :ALL ); ############################################################################### --- NEW FILE dhcpd-conf-to-ldap.pl --- #!/usr/bin/perl -w # Brian Masney # To use this script, set your base DN below. Then run # ./dhcpd-conf-to-ldap.pl < /path-to-dhcpd-conf/dhcpd.conf > output-file # The output of this script will generate entries in LDIF format. You can use # the slapadd command to add these entries into your LDAP server. You will # definately want to double check that your LDAP entries are correct before # you load them into LDAP. # This script does not do much error checking. Make sure before you run this # that the DHCP server doesn't give any errors about your config file use Sys::Hostname; my $basedn = "dc=ntelos, dc=net"; sub next_token { local ($lowercase) = @_; local ($token, $newline); do { if (!defined ($line) || length ($line) == 0) { $line = <>; return undef if !defined ($line); chop $line; $line_number++; $token_number = 0; } $line =~ s/#.*//; $line =~ s/^\s+//; $line =~ s/\s+$//; } while (length ($line) == 0); if (($token, $newline) = $line =~ /^(.*?)\s+(.*)/) { $line = $newline; } else { $token = $line; $line = ''; } $token_number++; $token =~ y/[A-Z]/[a-z]/ if $lowercase; return ($token); } sub remaining_line { local ($tmp, $str); $str = ""; while (($tmp = next_token (0))) { $str .= ' ' if !($str eq ""); $str .= $tmp; last if $tmp =~ /;\s*$/; } $str =~ s/;$//; return ($str); } sub add_dn_to_stack { local ($dn) = @_; $current_dn = "$dn, $current_dn"; } sub remove_dn_from_stack { $current_dn =~ s/^.*?,\s*//; } sub parse_error { print "Parse error on line number $line_number at token number $token_number\n"; exit (1); } sub print_entry { return if (scalar keys %curentry == 0); if (!defined ($curentry{'type'})) { $host = hostname (); $hostdn = "cn=$host, $basedn"; print "dn: $hostdn\n"; print "objectClass: top\n"; print "objectClass: dhcpServer\n"; print "cn: $host\n"; print "dhcpServiceDN: $current_dn\n\n"; print "dn: $current_dn\n"; print "cn: DHCP Config\n"; print "objectClass: top\n"; print "objectClass: dhcpService\n"; if (defined ($curentry{'options'})) { print "objectClass: dhcpOptions\n"; } print "dhcpPrimaryDN: $hostdn\n"; } elsif ($curentry{'type'} eq 'subnet') { print "dn: $current_dn\n"; print "cn: " . $curentry{'ip'} . "\n"; print "objectClass: top\n"; print "objectClass: dhcpSubnet\n"; if (defined ($curentry{'options'})) { print "objectClass: dhcpOptions\n"; } print "dhcpNetMask: " . $curentry{'netmask'} . "\n"; if (defined ($curentry{'range'})) { print "dhcpRange: " . $curentry{'range'} . "\n"; } } elsif ($curentry{'type'} eq 'shared-network') { print "dn: $current_dn\n"; print "cn: " . $curentry{'descr'} . "\n"; print "objectClass: top\n"; print "objectClass: dhcpSharedNetwork\n"; if (defined ($curentry{'options'})) { print "objectClass: dhcpOptions\n"; } } elsif ($curentry{'type'} eq 'group') { print "dn: $current_dn\n"; print "cn: group\n"; print "objectClass: top\n"; print "objectClass: dhcpGroup\n"; if (defined ($curentry{'options'})) { print "objectClass: dhcpOptions\n"; } } elsif ($curentry{'type'} eq 'host') { print "dn: $current_dn\n"; print "cn: " . $curentry{'host'} . "\n"; print "objectClass: top\n"; print "objectClass: dhcpHost\n"; if (defined ($curentry{'options'})) { print "objectClass: dhcpOptions\n"; } if (defined ($curentry{'hwaddress'})) { print "dhcpHWAddress: " . $curentry{'hwaddress'} . "\n"; } } elsif ($curentry{'type'} eq 'pool') { print "dn: $current_dn\n"; print "cn: pool\n"; print "objectClass: top\n"; print "objectClass: dhcpPool\n"; if (defined ($curentry{'options'})) { print "objectClass: dhcpOptions\n"; } if (defined ($curentry{'range'})) { print "dhcpRange: " . $curentry{'range'} . "\n"; } } elsif ($curentry{'type'} eq 'class') { print "dn: $current_dn\n"; print "cn: " . $curentry{'class'} . "\n"; print "objectClass: top\n"; print "objectClass: dhcpClass\n"; if (defined ($curentry{'options'})) { print "objectClass: dhcpOptions\n"; } } elsif ($curentry{'type'} eq 'subclass') { print "dn: $current_dn\n"; print "cn: " . $curentry{'subclass'} . "\n"; print "objectClass: top\n"; print "objectClass: dhcpSubClass\n"; if (defined ($curentry{'options'})) { print "objectClass: dhcpOptions\n"; } print "dhcpClassData: " . $curentry{'class'} . "\n"; } if (defined ($curentry{'statements'})) { foreach $statement (@{$curentry{'statements'}}) { print "dhcpStatements: $statement\n"; } } if (defined ($curentry{'options'})) { foreach $statement (@{$curentry{'options'}}) { print "dhcpOption: $statement\n"; } } print "\n"; undef (%curentry); } sub parse_netmask { local ($netmask) = @_; local ($i); if ((($a, $b, $c, $d) = $netmask =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) != 4) { parse_error (); } $num = (($a & 0xff) << 24) | (($b & 0xff) << 16) | (($c & 0xff) << 8) | ($d & 0xff); for ($i=1; $i<=32 && $num & (1 << (32 - $i)); $i++) { } $i--; return ($i); } sub parse_subnet { local ($ip, $tmp, $netmask); print_entry () if %curentry; $ip = next_token (0); parse_error () if !defined ($ip); $tmp = next_token (1); parse_error () if !defined ($tmp); parse_error () if !($tmp eq 'netmask'); $tmp = next_token (0); parse_error () if !defined ($tmp); $netmask = parse_netmask ($tmp); $tmp = next_token (0); parse_error () if !defined ($tmp); parse_error () if !($tmp eq '{'); add_dn_to_stack ("cn=$ip"); $curentry{'type'} = 'subnet'; $curentry{'ip'} = $ip; $curentry{'netmask'} = $netmask; } sub parse_shared_network { local ($descr, $tmp); print_entry () if %curentry; $descr = next_token (0); parse_error () if !defined ($descr); $tmp = next_token (0); parse_error () if !defined ($tmp); parse_error () if !($tmp eq '{'); add_dn_to_stack ("cn=$descr"); $curentry{'type'} = 'shared-network'; $curentry{'descr'} = $descr; } sub parse_host { local ($descr, $tmp); print_entry () if %curentry; $host = next_token (0); parse_error () if !defined ($host); $tmp = next_token (0); parse_error () if !defined ($tmp); parse_error () if !($tmp eq '{'); add_dn_to_stack ("cn=$host"); $curentry{'type'} = 'host'; $curentry{'host'} = $host; } sub parse_group { local ($descr, $tmp); print_entry () if %curentry; $tmp = next_token (0); parse_error () if !defined ($tmp); parse_error () if !($tmp eq '{'); add_dn_to_stack ("cn=group"); $curentry{'type'} = 'group'; } sub parse_pool { local ($descr, $tmp); print_entry () if %curentry; $tmp = next_token (0); parse_error () if !defined ($tmp); parse_error () if !($tmp eq '{'); add_dn_to_stack ("cn=pool"); $curentry{'type'} = 'pool'; } sub parse_class { local ($descr, $tmp); print_entry () if %curentry; $class = next_token (0); parse_error () if !defined ($class); $tmp = next_token (0); parse_error () if !defined ($tmp); parse_error () if !($tmp eq '{'); $class =~ s/\"//g; add_dn_to_stack ("cn=$class"); $curentry{'type'} = 'class'; $curentry{'class'} = $class; } sub parse_subclass { local ($descr, $tmp); print_entry () if %curentry; $class = next_token (0); parse_error () if !defined ($class); $subclass = next_token (0); parse_error () if !defined ($subclass); $tmp = next_token (0); parse_error () if !defined ($tmp); parse_error () if !($tmp eq '{'); add_dn_to_stack ("cn=$subclass"); $curentry{'type'} = 'subclass'; $curentry{'class'} = $class; $curentry{'subclass'} = $subclass; } sub parse_hwaddress { local ($type, $hw, $tmp); $type = next_token (0); parse_error () if !defined ($type); $hw = next_token (0); parse_error () if !defined ($hw); $hw =~ s/;$//; $curentry{'hwaddress'} = "$type $hw"; } sub parse_range { local ($tmp, $str); $str = remaining_line (); if (!($str eq '')) { $str =~ s/;$//; $curentry{'range'} = $str; } } sub parse_statement { local ($token) = shift; local ($str); if ($token eq 'option') { $str = remaining_line (); push (@{$curentry{'options'}}, $str); } else { $str = $token . " " . remaining_line (); push (@{$curentry{'statements'}}, $str); } } my $token; my $token_number = 0; my $line_number = 0; my %curentry; $current_dn = "cn=DHCP Config, $basedn"; $curentry{'descr'} = 'DHCP Config'; $line = ''; while (($token = next_token (1))) { if ($token eq '}') { print_entry () if %curentry; remove_dn_from_stack (); } elsif ($token eq 'subnet') { parse_subnet (); next; } elsif ($token eq 'shared-network') { parse_shared_network (); next; } elsif ($token eq 'class') { parse_class (); next; } elsif ($token eq 'subclass') { parse_subclass (); next; } elsif ($token eq 'pool') { parse_pool (); next; } elsif ($token eq 'group') { parse_group (); next; } elsif ($token eq 'host') { parse_host (); next; } elsif ($token eq 'hardware') { parse_hwaddress (); next; } elsif ($token eq 'range') { parse_range (); next; } else { parse_statement ($token); next; } } --- NEW FILE draft-ietf-dhc-ldap-schema-01.txt --- Network Working Group M. Meredith, Internet Draft V. Nanjundaswamy, Document: M. Hinckley Category: Proposed Standard Novell Inc. Expires: 15th December 2001 16th June 2001 LDAP Schema for DHCP Status of this Memo This document is an Internet-Draft and is in full conformance with all provisions of Section 10 of RFC2026 [ ]. Internet-Drafts are working documents of the Internet Engineering Task Force (IETF), its areas, and its working groups. Note that other groups may also distribute working documents as Internet-Drafts. Internet- Drafts are draft documents valid for a maximum of six months and may be updated, replaced, or obsolete by other documents at any time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." The list of current Internet- Drafts can be accessed at http://www.ietf.org/ietf/1id-abstracts.txt The list of Internet-Draft Shadow Directories can be accessed at http://www.ietf.org/shadow.html. 1. Abstract This document defines a schema for representing DHCP configuration in an LDAP directory. It can be used to represent the DHCP Service configuration(s) for an entire enterprise network, a subset of the network, or even a single server. Representing DHCP configuration in an LDAP directory enables centralized management of DHCP services offered by one or more DHCP Servers within the enterprise. 2. Conventions used in this document The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in RFC-2119 [ ]. In places where different sets of terminology are commonly used to represent similar DHCP concepts, this schema uses the terminology of the Internet Software Consortium's DHCP server reference implementation. For more information see www.isc.org. 3. Design Considerations The DHCP LDAP schema is designed to be a simple multi-server schema. The M. Meredith et al. Expires December 2001 [Page 1] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 intent of this schema is to provide a basic framework for representing the most common elements used in the configuration of DHCP Server. This should allow other network services to obtain and use basic DHCP configuration information in a server-independent but knowledgeable way. It is expected that some implementations may need to extend the schema objects, in order to implement all of their features or needs. It is recommended that you use the schema defined in this draft to represent DHCP configuration information in an LDAP directory. Conforming to a standard schema improves interoperability between DHCP implementations from different vendors. Some implementations may choose not to support all of the objects defined here. Two decisions are explicitly left up to each implementation: First, implementations may choose not to store the lease information in the directory, so those objects would not be used. Second, implementations may choose not to implement the auditing information. It is up to the implementation to determine if the data in the directory is considered "authoritative", or if it is simply a copy of data from an authoritative source. Validity of the information if used as a copy is to be ensured by the implementation. Primarily two types of applications will use the information in this schema: 1. DHCP servers (for loading their configuration) 2. Management Interfaces (for defining/editing configurations). The schema should be efficient for the needs of both types of applications. The schema is designed to allow objects managed by DHCP (such as computers, subnets, etc) to be present anywhere in a directory hierarchy (to allow those objects to be placed in the directory for managing administrative control and access to the objects). The schema uses a few naming conventions - all object classes and attributes are prefixed with "dhcp" to decrease the chance that object classes and attributes will have the same name. The schema also uses standard naming attributes ("cn", "ou", etc) for all objects. 4. Common DHCP Configuration Attributes Although DHCP manages several different types of objects, the configuration of those objects is often similar. Consequently, most of these objects have a common set of attributes, which are defined below. M. Meredith et al. Expires December 2001 [Page 2] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 4.1. Attributes Definitions The schema definitions listed below are for readability. The LDIF layout for this schema will follow in section 8. Name: dhcpPrimaryDN Description: The Distinguished Name of the dhcpServer object, which is the primary server for the configuration. Syntax: DN Flags: SINGLE-VALUE Named: dhcpSecondaryDN Description: The Distinguished Name(s) of the dhcpServer object(s), which are secondary servers for the configuration. Syntax: DN Name: dhcpStatements Description: Flexible storage for representing any specific data depending on the object to which it is attached. Examples include conditional statements, Server parameters, etc. This also serves as a 'catch-all' attribute that allows the standard to evolve without needing to update the schema. Syntax: IA5String Name: dhcpRange Description: The starting and ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value. Syntax: IA5String Name: dhcpPermitList Description: This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value. Syntax: IA5String Name: dhcpNetMask Description: The subnet mask length for the subnet. The mask can be easily computed from this length. Syntax: Integer Flags: SINGLE-VALUE Name: dhcpOption Description: Encoded option values to be sent to clients. Each value represents a single option and contains (OptionTag, Length, OptionData) encoded in the format used by DHCP. For more information see [DHCPOPT]. Syntax: OctetString Name: dhcpClassData Description: Encoded text string or list of bytes expressed in hexadecimal, separated by colons. Clients match subclasses based on matching the class data with the results of a 'match' or 'spawn with' statement in the class name declarations. Syntax: IA5String Flags: SINGLE-VALUE Name: dhcpSubclassesDN Description: List of subclasses, these are the actual DN of each subclass object. Syntax: DN Name: dhcpClassesDN Description: List of classes, these are the actual DN of each class object. Syntax: DN M. Meredith et al. Expires December 2001 [Page 3] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 Name: dhcpSubnetDN Description: List of subnets, these are the actual DN of each subnet object. Syntax: DN Name: dhcpPoolDN Description: List of pools, these are the actual DN of each Pool object. Syntax: DN Name: dhcpOptionsDN Description: List of options, these are the actual DN of each Options object. Syntax: DN Name: dhcpHostDN Description: List of hosts, these are the actual DN of each host object. Syntax: DN Name: dhcpSharedNetworkDN Description: List of shared networks, these are the actual DN of each shared network object. Syntax: DN Name: dhcpGroupDN Description: List of groups, these are the actual DN of each Group object. Syntax: DN Name: dhcpLeaseDN Description: Single Lease DN. A dhcpHost configuration uses this attribute to identify a static IP address assignment. Syntax: DN Flags: SINGLE-VALUE Name: dhcpLeasesDN Description: List of leases, these are the actual DN of each lease object. Syntax: DN Name: dhcpServiceDN Description: The DN of dhcpService object(s)which contain the configuration information. Each dhcpServer object has this attribute identifying the DHCP configuration(s) that the server is associated with. Syntax: DN Name: dhcpHWAddress Description: The hardware address of the client associated with a lease Syntax: OctetString Flags: SINGLE-VALUE Name: dhcpVersion Description: This is the version identified for the object that this attribute is part of. In case of the dhcpServer object, this represents the DHCP software version. Syntax: IA5String Flags: SINGLE-VALUE Name: dhcpImplementation Description: DHCP Server implementation description e.g. DHCP Vendor information. Syntax: IA5String Flags: SINGLE-VALUE Name: dhcpHashBucketAssignment Description: HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074]. Syntax: Octet String Flags: SINGLE-VALUE Name: dhcpDelayedServiceParameter Description: Delay in seconds corresponding to Delayed Service Parameter configuration, as defined in M. Meredith et al. Expires December 2001 [Page 4] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 DHC Load Balancing Algorithm [RFC 3074]. Syntax: Integer Flags: SINGLE- VALUE Name: dhcpMaxClientLeadTime Description: Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR] Syntax: Integer Flags: SINGLE-VALUE Name: dhcpFailOverEndpointState Description: Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR] Syntax: IA5String Flags: SINGLE-VALUE 5. Configurations and Services The schema definitions below are for readability the LDIF layout for this schema will follow in section 8. The DHC working group is currently considering several proposals for fail-over and redundancy of DHCP servers. These may require sharing of configuration information between servers. This schema provides a generalized mechanism for supporting any of these proposals, by separating the definition of a server from the definition of configuration service provided by the server. Separating the DHCP Server (dhcpServer) and the DHCP Configuration (dhcpService) representations allows a configuration service to be provided by one or more servers. Similarly, a server may provide one or more configurations. The schema allows a server to be configured as either a primary or secondary provider of a DHCP configuration. Configurations are also defined so that one configuration can include some of the objects that are defined in another configuration. This allows for sharing and/or a hierarchy of related configuration items. Name: dhcpService Description: Service object that represents the actual DHCP Service configuration. This will be a container with the following attributes. Must: cn, dhcpPrimaryDN May: dhcpSecondaryDN, dhcpSharedNetworkDN, dhcpSubnetDN, dhcpGroupDN, dhcpHostDN, dhcpClassesDN, dhcpOptionsDN, dhcpStatements The following objects could exist inside the dhcpService container: dhcpSharedNetwork, dhcpSubnet, dhcpGroup, dhcpHost, dhcpClass, dhcpOptions, dhcpLog Name: dhcpServer Description: Server object that the DHCP server will login as. The configuration information is in the dhcpService container that the dhcpServiceDN points to. Must: cn, dhcpServiceDN May: dhcpVersion, dhcpImplementation, dhcpHashBucketAssignment, dhcpDelayedServiceParameter, dhcpMaxClientLeadTime, M. Meredith et al. Expires December 2001 [Page 5] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 dhcpFailOverEndpointState, dhcpStatements 5.1. DHCP Declaration related classes: Name: dhcpSharedNetwork Description: Shared Network class will list what pools and subnets are in this network. This will be a container with the following attributes. Must: cn May: dhcpSubnetDN, dhcpPoolDN, dhcpOptionsDN, dhcpStatements The following objects can exist within a dhcpSharedNetwork container: dhcpSubnet, dhcpPool, dhcpOptions, dhcpLog Name: dhcpSubnet Description: Subnet object will include configuration information associated with a subnet, including a range and a net mask. This will be a container with the following attributes. Must: cn (Subnet address), dhcpNetMask May: dhcpRange, dhcpPoolDN, dhcpGroupDN, dhcpHostDN, dhcpClassesDN, dhcpLeasesDN, dhcpOptionsDN, dhcpStatements The following objects can exist within a dhcpSubnet container: dhcpPool, dhcpGroup, dhcpHost, dhcpClass, dhcpOptions, dhcpLease, dhcpLog Name: dhcpGroup Description: Group object will have configuration information associated with a group. This will be a container with the following attributes. Must: cn May: dhcpHostDN, dhcpOptionsDN, dhcpStatements The following objects can exist within a dhcpGroup container: dhcpHost, dhcpOptions Name: dhcpHost Description: The host object includes DHCP host declarations to assign a static IP address or declare the client as known or specify statements for a specific client. Must: cn May: dhcpLeaseDN, dhcpHWAddress, dhcpOptionsDN, dhcpStatements The following objects can exist within a dhcpHost container: dhcpLease, dhcpOptions Name: dhcpOptions Description: The options class is for option space declarations, it contains a list of options. Must: cn, dhcpOption Name: dhcpClass Description: This is a class to group clients together based on matching rules. This will be a container with the following attributes. Must: cn May: dhcpSubClassesDN, dhcpOptionsDN, dhcpStatements The following object can exist within a dhcpClass container: dhcpSubclass, dhcpOptions M. Meredith et al. Expires December 2001 [Page 6] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 Name: dhcpSubClass Description: This includes configuration information for a subclass associated with a class. The dhcpSubClass object will always be contained within the corresponding class container object. Must: cn May: dhcpClassData, dhcpOptionsDN, dhcpStatements Name: dhcpPool Description: This contains configuration for a pool that will have the range of addresses, permit lists and point to classes and leases that are members of this pool. This will be a container that could be contained by dhcpSubnet or a dhcpSharedNetwork. Must: cn, dhcpRange May: dhcpClassesDN, dhcpPermitList, dhcpLeasesDN, dhcpOptionsDN, dhcpStatements The following objects can exist within a dhcpPool container: dhcpClass, dhcpOptions, dhcpLease, dhcpLog 6. Tracking Address Assignments The behavior of a DHCP server is influenced by two factors - it's configuration and the current state of the addresses that have been assigned to clients. This schema defines a set of objects for representing the DHCP configuration associated with a server. The following object classes provide the ability to record how addresses are used including maintaining history (audit log) on individual leases. Recording lease information in a directory could result in a significant performance impact and is therefore optional. Implementations supporting logging of leases need to consider the performance impact. 6.1. dhcpLeases Attribute Definitions The schema definitions below are for readability the LDIF layout for this schema will follow in section 8. Name: dhcpAddressState Description: This stores information about the current binding-status of an address. For dynamic addresses managed by DHCP, the values should be restricted to the states defined in the DHCP Failover Protocol draft [FAILOVR]: 'FREE', 'ACTIVE', 'EXPIRED', 'RELEASED', 'RESET', 'ABANDONED', 'BACKUP'. For more information on these states see [FAILOVR]. For other addresses, it SHOULD be one of the following: 'UNKNOWN', 'RESERVED' (an address that is managed by DHCP that is reserved for a specific client), 'RESERVED-ACTIVE' (same as reserved, but address is currently in use), 'ASSIGNED' (assigned manually or by some other mechanism), 'UNASSIGNED', 'NOTASSIGNABLE'. Syntax: IA5String Flags: SINGLE-VALUE Name: dhcpExpirationTime Description: This is the time the current lease for an address expires. Syntax: DateTime Flags: SINGLE-VALUE M. Meredith et al. Expires December 2001 [Page 7] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 Name: dhcpStartTimeOfState Description: This is the time of the last state change for a leased address. Syntax: DateTime Flags: SINGLE-VALUE Name: dhcpLastTransactionTime Description: This is the last time a valid DHCP packet was received from the client. Syntax: DateTime Flags: SINGLE-VALUE Name: dhcpBootpFlag Description: This indicates whether the address was assigned via BOOTP Syntax: Boolean Flags: SINGLE-VALUE Name: dhcpDomainName Description: This is the name of the domain sent to the client by the server. It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN. To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".". Syntax: IA5String Flags: SINGLE-VALUE Name: dhcpDnsStatus Description: This indicates the status of updating DNS resource records on behalf of the client by the DHCP server for this address. The value is a 16-bit bitmask that has the same values as specified by the Failover-DDNS option (see [FAILOVR]). Syntax: Integer Flags: SINGLE-VALUE Name: dhcpRequestedHostName Description: This is the hostname that was requested by the client. Syntax: IA5String Flags: SINGLE-VALUE Name: dhcpAssignedHostName Description: This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client. The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name. Syntax: IA5String Flags: SINGLE-VALUE Name: dhcpReservedForClient Description: This is the distinguished name of the "dhcpHost" that an address is reserved for. This may not be the same as the "dhcpAssignedToClient" attribute if the address is being reassigned but the current lease has not yet expired. Syntax: DN Flags: SINGLE-VALUE Name: dhcpAssignedToClient Description: This is the distinguished name of a "dhcpHost" that an address is currently assigned to. This attribute is only present in the class when the address is leased. Syntax: DN Flags: SINGLE-VALUE Name: dhcpRelayAgentInfo Description: If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request. This is a hex-encoded option value. Syntax: OctetString Flags: SINGLE-VALUE Name: dhcpErrorLog Description: Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease. Syntax: IA5String M. Meredith et al. Expires December 2001 [Page 8] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 6.2. dhcpLeases Object Class This class represents an IP address. It may or may not be leaseable, and the object may exist even though a lease is not currently active for the associated IP address. It is recommended that all Lease objects for a single DHCP Service be centrally located within a single container. This ensures that the lease objects and the corresponding logs do not have to be relocated, when address ranges allocated to individual DHCP subnets and/or pools change. The schema definitions below are for readability the LDIF layout for this schema will follow in section 8. Name: dhcpLeases Description: This is the object that holds state information about an IP address. The cn (which is the IP address), and the current address-state are mandatory attributes. If the address is assigned then, some of the optional attributes will have valid data. Must: cn, dhcpAddressState May: dhcpExpirationTime, dhcpStartTimeOfState, dhcpLastTransactionTime, dhcpBootpFlag, dhcpDomainName, dhcpDnsStatus, dhcpRequestedHostName, dhcpAssignedHostName, dhcpReservedForClient, dhcpAssignedToClient, dhcpRelayAgentInfo, dhcpHWAddress 6.3 Audit Log Information A dhcpLog object is created whenever a lease is assigned or released. This object is intended to be created under the corresponding dhcpLeases container, or dhcpPool, dhcpSubnet, dhcpSharedNetwork or dhcpService containers. The log information under the dhcpLeases container would be for addresses matching that lease information. The log information in the other containers could be used for errors, i.e. when a pool or subnet is out our addresses or if a server is not able to assign any more addresses for a particular dhcpService. Name: dhcpLog Description: This is the object that holds past information about an IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released. Must: cn May: dhcpAddressState, dhcpExpirationTime, dhcpStartTimeOfState, dhcpLastTransactionTime, dhcpBootpFlag, dhcpDomainName, dhcpDnsStatus, dhcpRequestedHostName, dhcpAssignedHostName, dhcpReservedForClient, dhcpAssignedToClient, dhcpRelayAgentInfo, dhcpHWAddress, dhcpErrorLog M. Meredith et al. Expires December 2001 [Page 9] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 7. Determining settings The dhcpStatements attribute is the key to DHC enhancements that may come along, and the different key words that a particular server implementation may use. This attribute can be used to hold conditional DHCP Statements and DHCP server parameters. Having a generic settings attribute that is just a string, allows this schema to be extensible and easy to configure. All of the attributes that end with DN are references to the class that precedes the DN e.g. the dhcpPrimaryDN and dhcpSecondaryDN attributes hold the Distinguished Names of the dhcpServer objects that are associated with the dhcpService object. 8. LDIF format for attributes and classes. # Attributes ( 2.16.840.1.113719.1.203.4.1 NAME 'dhcpPrimaryDN' DESC 'The DN of the dhcpServer which is the primary server for the configuration.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.2 NAME 'dhcpSecondaryDN' DESC 'The DN of dhcpServer(s) which provide backup service for the configuration.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.3 NAME 'dhcpStatements' DESC 'Flexible storage for specific data depending on what object this exists in. Like conditional statements, server parameters, etc. This allows the standard to evolve without needing to adjust the schema.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) ( 2.16.840.1.113719.1.203.4.4 NAME 'dhcpRange' DESC 'The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) ( 2.16.840.1.113719.1.203.4.5 NAME 'dhcpPermitList' DESC 'This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) ( 2.16.840.1.113719.1.203.4.6 NAME 'dhcpNetMask' DESC 'The subnet mask length for the subnet. The mask can be easily computed from this length.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.7 NAME 'dhcpOption' DESC 'Encoded option values to be sent to clients. Each value represents a single option and contains (OptionTag, Length, OptionValue) encoded in the format used by DHCP.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) M. Meredith et al. Expires December 2001 [Page 10] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 ( 2.16.840.1.113719.1.203.4.8 NAME 'dhcpClassData' DESC 'Encoded text string or list of bytes expressed in hexadecimal, separated by colons. Clients match subclasses based on matching the class data with the results of match or spawn with statements in the class name declarations.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.9 NAME 'dhcpOptionsDN' DESC 'The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.10 NAME 'dhcpHostDN' DESC 'the distinguished name(s) of the dhcpHost objects.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.11 NAME 'dhcpPoolDN' DESC 'The distinguished name(s) of pools.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.12 NAME 'dhcpGroupDN' DESC 'The distinguished name(s) of the groups.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.13 NAME 'dhcpSubnetDN' DESC 'The distinguished name(s) of the subnets.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.14 NAME 'dhcpLeaseDN' DESC 'The distinguished name of a client address.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE) ( 2.16.840.1.113719.1.203.4.15 NAME 'dhcpLeasesDN' DESC 'The distinguished name(s) client addresses.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.16 NAME 'dhcpClassesDN' DESC 'The distinguished name(s) of a class(es) in a subclass.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.17 NAME 'dhcpSubclassesDN' DESC 'The distinguished name(s) of subclass(es).' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.18 NAME 'dhcpSharedNetworkDN' DESC 'The distinguished name(s) of sharedNetworks.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.19 NAME 'dhcpServiceDN' DESC 'The DN of dhcpService object(s)which contain the configuration information. Each dhcpServer object has this attribute identifying the DHCP M. Meredith et al. Expires December 2001 [Page 11] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 configuration(s) that the server is associated with.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) ( 2.16.840.1.113719.1.203.4.20 NAME 'dhcpVersion' DESC 'The version attribute of this object.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE- VALUE ) ( 2.16.840.1.113719.1.203.4.21 NAME 'dhcpImplementation' DESC 'Description of the DHCP Server implementation e.g. DHCP Server's vendor.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.22 NAME 'dhcpAddressState' DESC 'This stores information about the current binding-status of an address. For dynamic addresses managed by DHCP, the values should be restricted to the following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", "ABANDONED", "BACKUP". For other addresses, it SHOULD be one of the following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP that is reserved for a specific client), "RESERVED-ACTIVE" (same as reserved, but address is currently in use), "ASSIGNED" (assigned manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.23 NAME 'dhcpExpirationTime' DESC 'This is the time the current lease for an address expires.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.24 NAME 'dhcpStartTimeOfState' DESC 'This is the time of the last state change for a leased address.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.25 NAME 'dhcpLastTransactionTime' DESC 'This is the last time a valid DHCP packet was received from the client.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.26 NAME 'dhcpBootpFlag' DESC 'This indicates whether the address was assigned via BOOTP.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.27 NAME 'dhcpDomainName' DESC 'This is the name of the domain sent to the client by the server. It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN. To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".".' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE- VALUE ) ( 2.16.840.1.113719.1.203.4.28 NAME 'dhcpDnsStatus' DESC 'This indicates the status of updating DNS resource records on behalf of the client by M. Meredith et al. Expires December 2001 [Page 12] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 the DHCP server for this address. The value is a 16-bit bitmask.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.29 NAME 'dhcpRequestedHostName' DESC 'This is the hostname that was requested by the client.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.30 NAME 'dhcpAssignedHostName' DESC 'This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client. The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE- VALUE ) ( 2.16.840.1.113719.1.203.4.31 NAME 'dhcpReservedForClient' DESC 'The distinguished name of a "dhcpClient" that an address is reserved for. This may not be the same as the "dhcpAssignedToClient" attribute if the address is being reassigned but the current lease has not yet expired.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.32 NAME 'dhcpAssignedToClient' DESC 'This is the distinguished name of a "dhcpClient" that an address is currently assigned to. This attribute is only present in the class when the address is leased.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.33 NAME 'dhcpRelayAgentInfo' DESC 'If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request. This is a hex-encoded option value.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.34 NAME 'dhcpHWAddress' DESC 'The clients hardware address that requested this IP address.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.35 NAME 'dhcpHashBucketAssignment' DESC 'HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.36 NAME 'dhcpDelayedServiceParameter' DESC 'Delay in seconds corresponding to Delayed Service Parameter configuration, as defined in DHC Load Balancing Algorithm [RFC 3074]. ' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.37 NAME 'dhcpMaxClientLeadTime' DESC 'Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 M. Meredith et al. Expires December 2001 [Page 13] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.38 NAME 'dhcpFailOverEndpointState' DESC 'Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) ( 2.16.840.1.113719.1.203.4.39 NAME 'dhcpErrorLog' DESC Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease. SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) #Classes ( 2.16.840.1.113719.1.203.6.1 NAME 'dhcpService' DESC ' Service object that represents the actual DHCP Service configuration. This is a container object.' SUP top MUST (cn $ dhcpPrimaryDN) MAY (dhcpSecondaryDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ dhcpOptionsDN $ dhcpStatements ) ) ( 2.16.840.1.113719.1.203.6.2 NAME 'dhcpSharedNetwork' DESC 'This stores configuration information for a shared network.' SUP top MUST cn MAY (dhcpSubnetDN $ dhcpPoolDN $ dhcpOptionsDN $ dhcpStatements) X- NDS_CONTAINMENT ('dhcpService' ) ) ( 2.16.840.1.113719.1.203.6.3 NAME 'dhcpSubnet' DESC 'This class defines a subnet. This is a container object.' SUP top MUST ( cn $ dhcpNetMask ) MAY (dhcpRange $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork') ) ( 2.16.840.1.113719.1.203.6.4 NAME 'dhcpPool' DESC 'This stores configuration information about a pool.' SUP top MUST ( cn $ dhcpRange ) MAY (dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') ) ( 2.16.840.1.113719.1.203.6.5 NAME 'dhcpGroup' DESC 'Group object that lists host DNs and parameters. This is a container object.' SUP top MUST cn MAY ( dhcpHostDN $ dhcpOptionsDN $ dhcpStatements ) X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpService' ) ) ( 2.16.840.1.113719.1.203.6.6 NAME 'dhcpHost' DESC 'This represents information about a particular client' SUP top MUST cn MAY (dhcpLeaseDN $ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' 'dhcpGroup') ) ( 2.16.840.1.113719.1.203.6.7 NAME 'dhcpClass' DESC 'Represents information about a collection of related clients.' SUP top MUST cn MAY (dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' ) ) ( 2.16.840.1.113719.1.203.6.8 NAME 'dhcpSubClass' DESC 'Represents information about a collection of related classes.' SUP top MUST cn MAY (dhcpClassData $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT M. Meredith et al. Expires December 2001 [Page 14] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 'dhcpClass' ) ( 2.16.840.1.113719.1.203.6.9 NAME 'dhcpOptions' DESC 'Represents information about a collection of options defined.' SUP top MUST cn MAY ( dhcpOption ) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet' 'dhcpPool' 'dhcpGroup' 'dhcpHost' 'dhcpClass' ) ( 2.16.840.1.113719.1.203.6.10 NAME 'dhcpLeases' DESC 'This class represents an IP Address, which may or may not have been leased.' SUP top MUST ( cn $ dhcpAddressState ) MAY ( dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress ) X-NDS_CONTAINMENT ( 'dhcpService' 'dhcpSubnet' 'dhcpPool') ) ( 2.16.840.1.113719.1.203.6.11 NAME 'dhcpLog' DESC 'This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.' SUP top MUST ( cn ) MAY ( dhcpAddressState $ dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog) X-NDS_CONTAINMENT ('dhcpLeases' 'dhcpPool' 'dhcpSubnet' 'dhcpSharedNetwork' 'dhcpService' ) ) ( 2.16.840.1.113719.1.203.6.12 NAME 'dhcpServer' DESC 'DHCP Server Object' SUP top MUST (cn, dhcpServiceDN) MAY (dhcpVersion $ dhcpImplementation $ dhcpHashBucketAssignment $ dhcpDelayedServiceParameter $ dhcpMaxClientLeadTime $ dhcpFailOverEndpointState $ dhcpStatements) X-NDS_CONTAINMENT ('O' 'OU' 'dc') ) 9. Security Considerations Since the DHCP Configuration information is stored in a directory, the security of the information is limited to the security offered by the directory including the security of the objects within that directory. 10. Intellectual Property Rights Notices The IETF takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on the IETF's procedures with respect to rights in standards-track and standards- M. Meredith et al. Expires December 2001 [Page 15] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 related documentation can be found in BCP-11. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification can be obtained from the IETF Secretariat. The IETF invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to practice this standard. Please address the information to the IETF Executive Director. 11. Full Copyright Statement Copyright (C) The Internet Society (2001). All Rights Reserved. This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to the Internet Society or other Internet organizations, except as needed for the purpose of developing Internet standards in which case the procedures for copyrights defined in the Internet Standards process must be followed, or as required to translate it into languages other than English. The limited permissions granted above are perpetual and will not be revoked by the Internet Society or its successors or assigns. This document and the information contained herein is provided on an "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. 12. References [RFC2131] Droms, R., "Dynamic Host Configuration Protocol", RFC 2131, March 1997. [RFC2132] Alexander, S., Droms, R., "DHCP Options and BOOTP Vendor Extensions", RFC 2132, March 1997. M. Meredith et al. Expires December 2001 [Page 16] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 [MSDHCP] Gu, Y., Vyaghrapuri, R., "An LDAP Schema for Dynamic Host Configuration Protocol Service", Internet Draft , August 1998. [NOVDHCP] Miller, T., Patel, A., Rao, P., "Lightweight Directory Access Protocol (v3): Schema for Dynamic Host Configuration Protocol (DHCP)", Internet Draft , June 1998. [FAILOVR] Droms, R., Rabil, G., Dooley, M., Kapur, A., Gonczi, S., Volz, B., "DHCP Failover Protocol", Internet Draft , July 2000. [RFC 3074] Volz B., Gonczi S., Lemon T., Stevens R., "DHC Load Balancing Algorithm", February 2001 [AGENT] Patrick, M., "DHCP Relay Agent Information Option", Internet Draft , March 2000. [DHCPOPT] Carney, M., "New Option Review Guidelines and Additional Option Namespace", Internet Draft , October 1999. [POLICY] Strassner, J., Elleson, E., Moore, B., "Policy Framework LDAP Core Schema", Internet Draft , November 1999. [RFC2251] Wahl, M., Howes, T., Kille, S., "Lightweight Directory Access Protocol (v3)", RFC 2251, December 1997. [RFC2252] Wahl, M., Coulbeck, A., Howes, T., Kille, S., "Lightweight Directory Access Protocol (v3) Attribute Syntax Definitions", RFC 2252, December 1997. [RFC2255] Howes, T., Smith, M., "The LDAP URL Format", RFC 2255, December 1997. [RFC951] Croft, B., Gilmore, J., "Bootstrap Protocol (BOOTP)", RFC 951, September 1985. [RFC2119] Bradner, S. "Key words for use in RFCs to Indicate Requirement Levels", RFC 2119, March 1997. 13. Acknowledgments This work is partially based on a previous draft draft-ietf-dhc- schema-02.doc. M. Meredith et al. Expires December 2001 [Page 17] INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 14. Author's Addresses Comments regarding this draft may be sent to the authors at the following address: Mark Meredith Mark Hinckley Novell Inc. 1800 S. Novell Place Provo, Utah 84606 Vijay K. Nanjundaswamy Novell Software Development (I) Ltd 49/1 & 49/3, Garvebhavi Palya, 7th Mile, Hosur Road Bangalore 560068 email: mark_meredith at novell.com email: knvijay at novell.com email: mhinckley at novell.com This Internet Draft expires December 16, 2001. M. Meredith et al. Expires December 2001 [Page 18] --- NEW FILE linux.dbus-example --- #!/bin/bash # dhclient-script for Linux. Dan Halbert, March, 1997. # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. # No guarantees about this. I'm a novice at the details of Linux # networking. # Notes: # 0. This script is based on the netbsd script supplied with dhcp-970306. # 1. ifconfig down apparently deletes all relevant routes and flushes # the arp cache, so this doesn't need to be done explicitly. # 2. The alias address handling here has not been tested AT ALL. # I'm just going by the doc of modern Linux ip aliasing, which uses # notations like eth0:0, eth0:1, for each alias. # 3. I have to calculate the network address, and calculate the broadcast # address if it is not supplied. This might be much more easily done # by the dhclient C code, and passed on. # 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious # of the $1 in its args. if [ -n "${dhc_dbus}" ]; then /bin/dbus-send \ --system --dest=com.redhat.dhcp --type=method_call \ /com/redhat/dhcp/$interface com.redhat.dhcp.set \ 'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"; if (( ( dhc_dbus & 31 ) == 31 )); then exit 0; fi; fi; make_resolv_conf() { if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then echo search $new_domain_name >/etc/resolv.conf chmod 644 /etc/resolv.conf for nameserver in $new_domain_name_servers; do echo nameserver $nameserver >>/etc/resolv.conf done fi } # Must be used on exit. Invokes the local dhcp client exit hooks, if any. exit_with_hooks() { exit_status=$1 if [ -f /etc/dhclient-exit-hooks ]; then . /etc/dhclient-exit-hooks fi # probably should do something with exit status of the local script exit $exit_status } # Invoke the local dhcp client enter hooks, if they exist. if [ -f /etc/dhclient-enter-hooks ]; then exit_status=0 . /etc/dhclient-enter-hooks # allow the local script to abort processing of this state # local script must set exit_status variable to nonzero. if [ $exit_status -ne 0 ]; then exit $exit_status fi fi release=`uname -r` release=`expr $release : '\(.*\)\..*'` relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'` relmajor=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'` if [ x$new_broadcast_address != x ]; then new_broadcast_arg="broadcast $new_broadcast_address" fi if [ x$old_broadcast_address != x ]; then old_broadcast_arg="broadcast $old_broadcast_address" fi if [ x$new_subnet_mask != x ]; then new_subnet_arg="netmask $new_subnet_mask" fi if [ x$old_subnet_mask != x ]; then old_subnet_arg="netmask $old_subnet_mask" fi if [ x$alias_subnet_mask != x ]; then alias_subnet_arg="netmask $alias_subnet_mask" fi if [ x$reason = xMEDIUM ]; then # Linux doesn't do mediums (ok, ok, media). exit_with_hooks 0 fi if [ x$reason = xPREINIT ]; then if [ x$alias_ip_address != x ]; then # Bring down alias interface. Its routes will disappear too. ifconfig $interface:0- inet 0 fi if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ) then ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ broadcast 255.255.255.255 up # Add route to make broadcast work. Do not omit netmask. route add default dev $interface netmask 0.0.0.0 else ifconfig $interface 0 up fi # We need to give the kernel some time to get the interface up. sleep 1 exit_with_hooks 0 fi if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then exit_with_hooks 0 fi if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \ [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then current_hostname=`hostname` if [ x$current_hostname = x ] || \ [ x$current_hostname = x$old_host_name ]; then if [ x$current_hostname = x ] || \ [ x$new_host_name != x$old_host_name ]; then hostname $new_host_name fi fi if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ [ x$alias_ip_address != x$old_ip_address ]; then # Possible new alias. Remove old alias. ifconfig $interface:0- inet 0 fi if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then # IP address changed. Bringing down the interface will delete all routes, # and clear the ARP cache. ifconfig $interface inet 0 down fi fi if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then ifconfig $interface inet $new_ip_address $new_subnet_arg \ $new_broadcast_arg fi if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then # Add a network route to the computed network address. if [ $relmajor -lt 2 ] || \ ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then route add -net $new_network_number $new_subnet_arg dev $interface fi for router in $new_routers; do route add default gw $router done fi fi if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; then ifconfig $interface:0- inet 0 ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg route add -host $alias_ip_address $interface:0 fi fi if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then make_resolv_conf fi exit_with_hooks 0 fi if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ || [ x$reason = xSTOP ]; then if [ x$alias_ip_address != x ]; then # Turn off alias interface. ifconfig $interface:0- inet 0 fi if [ x$old_ip_address != x ]; then # Shut down interface, which will delete routes and clear arp cache. ifconfig $interface inet 0 down fi if [ x$alias_ip_address != x ]; then ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg route add -host $alias_ip_address $interface:0 fi exit_with_hooks 0 fi fi if [ x$reason = xTIMEOUT ]; then if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then if [ x$alias_ip_address != x ]; then ifconfig $interface:0- inet 0 fi ifconfig $interface inet $new_ip_address $new_subnet_arg \ $new_broadcast_arg fi set $new_routers ############## what is -w in ping? if ping -q -c 1 $1; then if [ x$new_ip_address != x$alias_ip_address ] && \ [ x$alias_ip_address != x ]; then ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg route add -host $alias_ip_address dev $interface:0 fi if [ $relmajor -lt 2 ] || \ ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then route add -net $new_network_number fi for router in $new_routers; do route add default gw $router done make_resolv_conf exit_with_hooks 0 fi if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then ifconfig $interface inet 0 down fi exit_with_hooks 1 fi exit_with_hooks 0 dhcp-3.0.5-Makefile.patch: Makefile | 8 ++++---- Makefile.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) Index: dhcp-3.0.5-Makefile.patch =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-Makefile.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dhcp-3.0.5-Makefile.patch 10 Nov 2006 17:02:31 -0000 1.2 +++ dhcp-3.0.5-Makefile.patch 5 Mar 2007 16:02:22 -0000 1.3 @@ -1,103 +1,3 @@ ---- dhcp-3.0.5/client/Makefile.dist.Makefile 2004-06-10 13:59:11.000000000 -0400 -+++ dhcp-3.0.5/client/Makefile.dist 2006-11-10 11:10:13.000000000 -0500 -@@ -128,6 +128,6 @@ - - - dhclient: $(OBJS) $(DHCPLIB) -- $(CC) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPLIB) $(LIBS) -+ $(CC) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o $(PROG) $(OBJS) $(DHCPLIB) $(LIBS) - - # Dependencies (semi-automatically-generated) ---- dhcp-3.0.5/dhcpctl/Makefile.dist.Makefile 2005-03-03 11:55:23.000000000 -0500 -+++ dhcp-3.0.5/dhcpctl/Makefile.dist 2006-11-10 11:11:16.000000000 -0500 -@@ -37,10 +37,10 @@ - all: libdhcpctl.a omshell cltest $(CATMANPAGES) - - omshell: omshell.o $(DHCPCTLLIBS) -- $(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS) -+ $(CC) $(DEBUG) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS) - - cltest: cltest.o $(DHCPCTLLIBS) -- $(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS) -+ $(CC) $(DEBUG) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS) - - libdhcpctl.a: $(OBJ) - rm -f libdhcpctl.a ---- dhcp-3.0.5/dst/Makefile.dist.Makefile 2004-06-10 13:59:28.000000000 -0400 -+++ dhcp-3.0.5/dst/Makefile.dist 2006-11-10 11:11:42.000000000 -0500 -@@ -30,7 +30,12 @@ - - all: libdst.a - --install: -+install: all -+ if [ ! -d $(DESTDIR)$(LIBDIR) ]; then \ -+ mkdir $(DESTDIR)$(LIBDIR); chmod 755 $(DESTDIR)$(LIBDIR); \ -+ fi -+ $(INSTALL) libdst.a $(DESTDIR)$(LIBDIR) -+ $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libdst.a - - libdst.a: $(OBJ) - rm -f dst.a ---- dhcp-3.0.5/minires/Makefile.dist.Makefile 2004-06-10 13:59:40.000000000 -0400 -+++ dhcp-3.0.5/minires/Makefile.dist 2006-11-10 11:14:00.000000000 -0500 -@@ -21,9 +21,6 @@ - # - # http://www.isc.org/ - --CATMANPAGES = dhcpctl.cat3 --SEDMANPAGES = dhcpctl.man3 --MAN = dhcpctl.3 - SRC = res_mkupdate.c res_init.c res_update.c res_send.c res_comp.c \ - res_sendsigned.c res_findzonecut.c res_query.c res_mkquery.c \ - ns_date.c ns_parse.c ns_sign.c ns_name.c ns_samedomain.c ns_verify.c -@@ -50,24 +47,17 @@ - -rm -f $(OBJ) libres.a - - realclean: clean -- -rm -f *~ $(CATMANPAGES) $(SEDMANPAGES) -+ -rm -f *~ - - distclean: realclean - -rm -f Makefile - - links: -- @for foo in $(SRC) $(MAN) $(HDRS); do \ -+ @for foo in $(SRC) $(HDRS); do \ - if [ ! -b $$foo ]; then \ - rm -f $$foo; \ - fi; \ - ln -s $(TOP)/minires/$$foo $$foo; \ - done - --dhcpctl.cat3: dhcpctl.man3 -- nroff -man dhcpctl.man3 >dhcpctl.cat3 -- --dhcpctl.man3: dhcpctl.3 -- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ -- -e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3 -- - # Dependencies (semi-automatically-generated) ---- dhcp-3.0.5/relay/Makefile.dist.Makefile 2004-06-10 13:59:50.000000000 -0400 -+++ dhcp-3.0.5/relay/Makefile.dist 2006-11-10 11:13:30.000000000 -0500 -@@ -83,6 +83,6 @@ - -e "s#RUNDIR#$(VARRUN)#" < dhcrelay.8 >dhcrelay.man8 - - dhcrelay: dhcrelay.o $(DHCPLIB) -- $(CC) $(LFLAGS) -o $(PROG) dhcrelay.o $(DHCPLIB) $(LIBS) -+ $(CC) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack -o $(PROG) dhcrelay.o $(DHCPLIB) $(LIBS) - - # Dependencies (semi-automatically-generated) ---- dhcp-3.0.5/server/Makefile.dist.Makefile 2004-06-10 13:59:50.000000000 -0400 -+++ dhcp-3.0.5/server/Makefile.dist 2006-11-10 11:14:27.000000000 -0500 -@@ -103,6 +103,6 @@ - -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5 - - dhcpd: $(OBJS) $(COBJ) $(DHCPLIB) -- $(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) -+ $(CC) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) - - # Dependencies (semi-automatically-generated) --- dhcp-3.0.5/Makefile.Makefile 2004-06-10 13:59:10.000000000 -0400 +++ dhcp-3.0.5/Makefile 2006-11-10 11:09:32.000000000 -0500 @@ -33,7 +33,7 @@ dhcp-3.0.5-extended-new-option-info.patch: client/dhclient.8 | 8 ++++++ client/dhclient.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/parse.c | 4 +++ common/tables.c | 32 +++++++++++++++++++++++++++ includes/dhcpd.h | 7 ++++++ 5 files changed, 114 insertions(+) Index: dhcp-3.0.5-extended-new-option-info.patch =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-extended-new-option-info.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dhcp-3.0.5-extended-new-option-info.patch 13 Nov 2006 18:04:31 -0000 1.2 +++ dhcp-3.0.5-extended-new-option-info.patch 5 Mar 2007 16:02:22 -0000 1.3 @@ -1,231 +1,5 @@ ---- dhcp-3.0.5/client/scripts/linux.dbus-example.enoi 2006-11-13 12:59:34.000000000 -0500 -+++ dhcp-3.0.5/client/scripts/linux.dbus-example 2006-11-13 12:59:26.000000000 -0500 -@@ -0,0 +1,223 @@ -+#!/bin/bash -+# dhclient-script for Linux. Dan Halbert, March, 1997. -+# Updated for Linux 2.[12] by Brian J. Murrell, January 1999. -+# No guarantees about this. I'm a novice at the details of Linux -+# networking. -+ -+# Notes: -+ -+# 0. This script is based on the netbsd script supplied with dhcp-970306. -+ -+# 1. ifconfig down apparently deletes all relevant routes and flushes -+# the arp cache, so this doesn't need to be done explicitly. -+ -+# 2. The alias address handling here has not been tested AT ALL. -+# I'm just going by the doc of modern Linux ip aliasing, which uses -+# notations like eth0:0, eth0:1, for each alias. -+ -+# 3. I have to calculate the network address, and calculate the broadcast -+# address if it is not supplied. This might be much more easily done -+# by the dhclient C code, and passed on. -+ -+# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious -+# of the $1 in its args. -+ -+if [ -n "${dhc_dbus}" ]; then -+ /bin/dbus-send \ -+ --system --dest=com.redhat.dhcp --type=method_call \ -+ /com/redhat/dhcp/$interface com.redhat.dhcp.set \ -+ 'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"; -+ if (( ( dhc_dbus & 31 ) == 31 )); then -+ exit 0; -+ fi; -+fi; -+ -+make_resolv_conf() { -+ if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then -+ echo search $new_domain_name >/etc/resolv.conf -+ chmod 644 /etc/resolv.conf -+ for nameserver in $new_domain_name_servers; do -+ echo nameserver $nameserver >>/etc/resolv.conf -+ done -+ fi -+} -+ -+# Must be used on exit. Invokes the local dhcp client exit hooks, if any. -+exit_with_hooks() { -+ exit_status=$1 -+ if [ -f /etc/dhclient-exit-hooks ]; then -+ . /etc/dhclient-exit-hooks -+ fi -+# probably should do something with exit status of the local script -+ exit $exit_status -+} -+ -+# Invoke the local dhcp client enter hooks, if they exist. -+if [ -f /etc/dhclient-enter-hooks ]; then -+ exit_status=0 -+ . /etc/dhclient-enter-hooks -+ # allow the local script to abort processing of this state -+ # local script must set exit_status variable to nonzero. -+ if [ $exit_status -ne 0 ]; then -+ exit $exit_status -+ fi -+fi -+ -+release=`uname -r` -+release=`expr $release : '\(.*\)\..*'` -+relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'` -+relmajor=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'` -+ -+if [ x$new_broadcast_address != x ]; then -+ new_broadcast_arg="broadcast $new_broadcast_address" -+fi -+if [ x$old_broadcast_address != x ]; then -+ old_broadcast_arg="broadcast $old_broadcast_address" -+fi -+if [ x$new_subnet_mask != x ]; then -+ new_subnet_arg="netmask $new_subnet_mask" -+fi -+if [ x$old_subnet_mask != x ]; then -+ old_subnet_arg="netmask $old_subnet_mask" -+fi -+if [ x$alias_subnet_mask != x ]; then -+ alias_subnet_arg="netmask $alias_subnet_mask" -+fi -+ -+if [ x$reason = xMEDIUM ]; then -+ # Linux doesn't do mediums (ok, ok, media). -+ exit_with_hooks 0 -+fi -+ -+if [ x$reason = xPREINIT ]; then -+ if [ x$alias_ip_address != x ]; then -+ # Bring down alias interface. Its routes will disappear too. -+ ifconfig $interface:0- inet 0 -+ fi -+ if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ) -+ then -+ ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ -+ broadcast 255.255.255.255 up -+ # Add route to make broadcast work. Do not omit netmask. -+ route add default dev $interface netmask 0.0.0.0 -+ else -+ ifconfig $interface 0 up -+ fi -+ -+ # We need to give the kernel some time to get the interface up. -+ sleep 1 -+ -+ exit_with_hooks 0 -+fi -+ -+if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then -+ exit_with_hooks 0 -+fi -+ -+if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \ -+ [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then -+ current_hostname=`hostname` -+ if [ x$current_hostname = x ] || \ -+ [ x$current_hostname = x$old_host_name ]; then -+ if [ x$current_hostname = x ] || \ -+ [ x$new_host_name != x$old_host_name ]; then -+ hostname $new_host_name -+ fi -+ fi -+ -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then -+ if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ -+ [ x$alias_ip_address != x$old_ip_address ]; then -+ # Possible new alias. Remove old alias. -+ ifconfig $interface:0- inet 0 -+ fi -+ if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then -+ # IP address changed. Bringing down the interface will delete all routes, -+ # and clear the ARP cache. -+ ifconfig $interface inet 0 down -+ -+ fi -+ fi -+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ -+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then -+ ifconfig $interface inet $new_ip_address $new_subnet_arg \ -+ $new_broadcast_arg -+ fi -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then -+ # Add a network route to the computed network address. -+ if [ $relmajor -lt 2 ] || \ -+ ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then -+ route add -net $new_network_number $new_subnet_arg dev $interface -+ fi -+ for router in $new_routers; do -+ route add default gw $router -+ done -+ fi -+ fi -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then -+ if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; -+ then -+ ifconfig $interface:0- inet 0 -+ ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -+ route add -host $alias_ip_address $interface:0 -+ fi -+ fi -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then -+ make_resolv_conf -+ fi -+ exit_with_hooks 0 -+fi -+ -+if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then -+if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ -+ || [ x$reason = xSTOP ]; then -+ if [ x$alias_ip_address != x ]; then -+ # Turn off alias interface. -+ ifconfig $interface:0- inet 0 -+ fi -+ if [ x$old_ip_address != x ]; then -+ # Shut down interface, which will delete routes and clear arp cache. -+ ifconfig $interface inet 0 down -+ fi -+ if [ x$alias_ip_address != x ]; then -+ ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -+ route add -host $alias_ip_address $interface:0 -+ fi -+ exit_with_hooks 0 -+fi -+fi -+ -+if [ x$reason = xTIMEOUT ]; then -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then -+ if [ x$alias_ip_address != x ]; then -+ ifconfig $interface:0- inet 0 -+ fi -+ ifconfig $interface inet $new_ip_address $new_subnet_arg \ -+ $new_broadcast_arg -+ fi -+ set $new_routers -+ ############## what is -w in ping? -+ if ping -q -c 1 $1; then -+ if [ x$new_ip_address != x$alias_ip_address ] && \ -+ [ x$alias_ip_address != x ]; then -+ ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -+ route add -host $alias_ip_address dev $interface:0 -+ fi -+ if [ $relmajor -lt 2 ] || \ -+ ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then -+ route add -net $new_network_number -+ fi -+ for router in $new_routers; do -+ route add default gw $router -+ done -+ make_resolv_conf -+ exit_with_hooks 0 -+ fi -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then -+ ifconfig $interface inet 0 down -+ fi -+ exit_with_hooks 1 -+fi -+ -+exit_with_hooks 0 --- dhcp-3.0.5/client/dhclient.c.enoi 2006-08-22 11:13:57.000000000 -0400 -+++ dhcp-3.0.5/client/dhclient.c 2006-11-13 12:44:11.000000000 -0500 ++++ dhcp-3.0.5/client/dhclient.c 2007-03-04 15:19:43.000000000 -0500 @@ -74,6 +74,9 @@ int onetry=0; int quiet=0; @@ -336,7 +110,7 @@ ++i; } while (i != 2); --- dhcp-3.0.5/client/dhclient.8.enoi 2005-09-14 12:03:33.000000000 -0400 -+++ dhcp-3.0.5/client/dhclient.8 2006-11-13 12:42:28.000000000 -0500 ++++ dhcp-3.0.5/client/dhclient.8 2007-03-04 15:19:43.000000000 -0500 @@ -82,6 +82,9 @@ .B -w ] @@ -360,7 +134,7 @@ The syntax of the dhclient.conf(5) file is discussed separately. .SH OMAPI --- dhcp-3.0.5/common/parse.c.enoi 2006-02-22 17:43:27.000000000 -0500 -+++ dhcp-3.0.5/common/parse.c 2006-11-13 12:42:28.000000000 -0500 ++++ dhcp-3.0.5/common/parse.c 2007-03-04 15:19:43.000000000 -0500 @@ -1271,6 +1271,10 @@ option_hash_add (option -> universe -> hash, (const char *)option -> name, @@ -373,7 +147,7 @@ } --- dhcp-3.0.5/common/tables.c.enoi 2006-02-22 17:43:27.000000000 -0500 -+++ dhcp-3.0.5/common/tables.c 2006-11-13 12:42:28.000000000 -0500 ++++ dhcp-3.0.5/common/tables.c 2007-03-04 15:19:43.000000000 -0500 @@ -1250,3 +1250,35 @@ fqdn_universe.name, 0, &fqdn_universe, MDL); @@ -411,7 +185,7 @@ +} +#endif --- dhcp-3.0.5/includes/dhcpd.h.enoi 2006-05-17 16:16:59.000000000 -0400 -+++ dhcp-3.0.5/includes/dhcpd.h 2006-11-13 12:42:28.000000000 -0500 ++++ dhcp-3.0.5/includes/dhcpd.h 2007-03-04 15:19:43.000000000 -0500 @@ -1811,6 +1811,13 @@ void initialize_common_option_spaces PROTO ((void)); struct universe *config_universe; dhcp-3.0.5-ldap-configuration.patch: common/conflex.c | 46 +- common/print.c | 6 includes/dhcpd.h | 50 ++ includes/site.h | 10 server/Makefile.dist | 6 server/class.c | 17 server/confpars.c | 12 server/dhcpd.c | 3 server/ldap.c | 1142 +++++++++++++++++++++++++++++++++++++++++++++++++++ server/mdb.c | 6 server/stables.c | 23 + 11 files changed, 1295 insertions(+), 26 deletions(-) Index: dhcp-3.0.5-ldap-configuration.patch =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-ldap-configuration.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dhcp-3.0.5-ldap-configuration.patch 4 Feb 2007 18:51:19 -0000 1.2 +++ dhcp-3.0.5-ldap-configuration.patch 5 Mar 2007 16:02:22 -0000 1.3 @@ -1,5 +1,5 @@ ---- dhcp-3.0.5/common/conflex.c.ldapconf 2007-01-31 20:39:38.000000000 -0500 -+++ dhcp-3.0.5/common/conflex.c 2007-01-31 20:39:38.000000000 -0500 +--- dhcp-3.0.5/common/conflex.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/common/conflex.c 2007-03-04 15:32:24.000000000 -0500 @@ -47,6 +47,7 @@ static enum dhcp_token read_number PROTO ((int, struct parse *)); static enum dhcp_token read_num_or_name PROTO ((int, struct parse *)); @@ -72,8 +72,8 @@ + return c; +} + ---- dhcp-3.0.5/common/print.c.ldapconf 2007-01-31 20:39:38.000000000 -0500 -+++ dhcp-3.0.5/common/print.c 2007-01-31 20:39:38.000000000 -0500 +--- dhcp-3.0.5/common/print.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/common/print.c 2007-03-04 15:32:24.000000000 -0500 @@ -166,9 +166,9 @@ } @@ -87,1620 +87,8 @@ { static char habuf [49]; char *s; ---- /dev/null 2007-01-31 10:24:38.956568237 -0500 -+++ dhcp-3.0.5/contrib/dhcpd-conf-to-ldap.pl 2007-01-31 20:39:38.000000000 -0500 -@@ -0,0 +1,517 @@ -+#!/usr/bin/perl -w -+ -+# Brian Masney -+# To use this script, set your base DN below. Then run -+# ./dhcpd-conf-to-ldap.pl < /path-to-dhcpd-conf/dhcpd.conf > output-file -+# The output of this script will generate entries in LDIF format. You can use -+# the slapadd command to add these entries into your LDAP server. You will -+# definately want to double check that your LDAP entries are correct before -+# you load them into LDAP. -+ -+# This script does not do much error checking. Make sure before you run this -+# that the DHCP server doesn't give any errors about your config file -+ -+use Sys::Hostname; -+ -+my $basedn = "dc=ntelos, dc=net"; -+ -+sub next_token -+{ -+ local ($lowercase) = @_; -+ local ($token, $newline); -+ -+ do -+ { -+ if (!defined ($line) || length ($line) == 0) -+ { -+ $line = <>; -+ return undef if !defined ($line); -+ chop $line; -+ $line_number++; -+ $token_number = 0; -+ } -+ -+ $line =~ s/#.*//; -+ $line =~ s/^\s+//; -+ $line =~ s/\s+$//; -+ } -+ while (length ($line) == 0); -+ -+ if (($token, $newline) = $line =~ /^(.*?)\s+(.*)/) -+ { -+ $line = $newline; -+ } -+ else -+ { -+ $token = $line; -+ $line = ''; -+ } -+ $token_number++; -+ -+ $token =~ y/[A-Z]/[a-z]/ if $lowercase; -+ -+ return ($token); -+} -+ -+ -+sub remaining_line -+{ -+ local ($tmp, $str); -+ -+ $str = ""; -+ while (($tmp = next_token (0))) -+ { -+ $str .= ' ' if !($str eq ""); -+ $str .= $tmp; -+ last if $tmp =~ /;\s*$/; -+ } -+ -+ $str =~ s/;$//; -+ return ($str); -+} -+ -+ -+sub -+add_dn_to_stack -+{ -+ local ($dn) = @_; -+ -+ $current_dn = "$dn, $current_dn"; -+} -+ -+ -+sub -+remove_dn_from_stack -+{ -+ $current_dn =~ s/^.*?,\s*//; -+} -+ -+ -+sub -+parse_error -+{ -+ print "Parse error on line number $line_number at token number $token_number\n"; -+ exit (1); -+} -+ -+ -+sub -+print_entry -+{ -+ return if (scalar keys %curentry == 0); -+ -+ if (!defined ($curentry{'type'})) -+ { -+ $host = hostname (); -+ $hostdn = "cn=$host, $basedn"; -+ print "dn: $hostdn\n"; -+ print "objectClass: top\n"; -+ print "objectClass: dhcpServer\n"; -+ print "cn: $host\n"; -+ print "dhcpServiceDN: $current_dn\n\n"; -+ -+ print "dn: $current_dn\n"; -+ print "cn: DHCP Config\n"; -+ print "objectClass: top\n"; -+ print "objectClass: dhcpService\n"; -+ if (defined ($curentry{'options'})) -+ { -+ print "objectClass: dhcpOptions\n"; -+ } -+ print "dhcpPrimaryDN: $hostdn\n"; -+ } -+ elsif ($curentry{'type'} eq 'subnet') -+ { -+ print "dn: $current_dn\n"; -+ print "cn: " . $curentry{'ip'} . "\n"; -+ print "objectClass: top\n"; -+ print "objectClass: dhcpSubnet\n"; -+ if (defined ($curentry{'options'})) -+ { -+ print "objectClass: dhcpOptions\n"; -+ } -+ -+ print "dhcpNetMask: " . $curentry{'netmask'} . "\n"; -+ if (defined ($curentry{'range'})) -+ { -+ print "dhcpRange: " . $curentry{'range'} . "\n"; -+ } -+ } -+ elsif ($curentry{'type'} eq 'shared-network') -+ { -+ print "dn: $current_dn\n"; -+ print "cn: " . $curentry{'descr'} . "\n"; -+ print "objectClass: top\n"; -+ print "objectClass: dhcpSharedNetwork\n"; -+ if (defined ($curentry{'options'})) -+ { -+ print "objectClass: dhcpOptions\n"; -+ } -+ } -+ elsif ($curentry{'type'} eq 'group') -+ { -+ print "dn: $current_dn\n"; -+ print "cn: group\n"; -+ print "objectClass: top\n"; -+ print "objectClass: dhcpGroup\n"; -+ if (defined ($curentry{'options'})) -+ { -+ print "objectClass: dhcpOptions\n"; -+ } -+ } -+ elsif ($curentry{'type'} eq 'host') -+ { -+ print "dn: $current_dn\n"; -+ print "cn: " . $curentry{'host'} . "\n"; -+ print "objectClass: top\n"; -+ print "objectClass: dhcpHost\n"; -+ if (defined ($curentry{'options'})) -+ { -+ print "objectClass: dhcpOptions\n"; -+ } -+ -+ if (defined ($curentry{'hwaddress'})) -+ { -+ print "dhcpHWAddress: " . $curentry{'hwaddress'} . "\n"; -+ } -+ } -+ elsif ($curentry{'type'} eq 'pool') -+ { -+ print "dn: $current_dn\n"; -+ print "cn: pool\n"; -+ print "objectClass: top\n"; -+ print "objectClass: dhcpPool\n"; -+ if (defined ($curentry{'options'})) -+ { -+ print "objectClass: dhcpOptions\n"; -+ } -+ -+ if (defined ($curentry{'range'})) -+ { -+ print "dhcpRange: " . $curentry{'range'} . "\n"; -+ } -+ } -+ elsif ($curentry{'type'} eq 'class') -+ { -+ print "dn: $current_dn\n"; -+ print "cn: " . $curentry{'class'} . "\n"; -+ print "objectClass: top\n"; -+ print "objectClass: dhcpClass\n"; -+ if (defined ($curentry{'options'})) -+ { -+ print "objectClass: dhcpOptions\n"; -+ } -+ } -+ elsif ($curentry{'type'} eq 'subclass') -+ { -+ print "dn: $current_dn\n"; -+ print "cn: " . $curentry{'subclass'} . "\n"; -+ print "objectClass: top\n"; -+ print "objectClass: dhcpSubClass\n"; -+ if (defined ($curentry{'options'})) -+ { -+ print "objectClass: dhcpOptions\n"; -+ } -+ print "dhcpClassData: " . $curentry{'class'} . "\n"; -+ } -+ -+ if (defined ($curentry{'statements'})) -+ { -+ foreach $statement (@{$curentry{'statements'}}) -+ { -+ print "dhcpStatements: $statement\n"; -+ } -+ } -+ -+ if (defined ($curentry{'options'})) -+ { -+ foreach $statement (@{$curentry{'options'}}) -+ { -+ print "dhcpOption: $statement\n"; -+ } -+ } -+ -+ print "\n"; -+ undef (%curentry); -+} -+ -+ -+sub parse_netmask -+{ -+ local ($netmask) = @_; -+ local ($i); -+ -+ if ((($a, $b, $c, $d) = $netmask =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) != 4) -+ { -+ parse_error (); -+ } -+ -+ $num = (($a & 0xff) << 24) | -+ (($b & 0xff) << 16) | -+ (($c & 0xff) << 8) | -+ ($d & 0xff); -+ -+ for ($i=1; $i<=32 && $num & (1 << (32 - $i)); $i++) -+ { -+ } -+ $i--; -+ -+ return ($i); -+} -+ -+ -+sub parse_subnet -+{ -+ local ($ip, $tmp, $netmask); -+ -+ print_entry () if %curentry; -+ -+ $ip = next_token (0); -+ parse_error () if !defined ($ip); -+ -+ $tmp = next_token (1); -+ parse_error () if !defined ($tmp); -+ parse_error () if !($tmp eq 'netmask'); -+ -+ $tmp = next_token (0); -+ parse_error () if !defined ($tmp); -+ $netmask = parse_netmask ($tmp); -+ -+ $tmp = next_token (0); -+ parse_error () if !defined ($tmp); -+ parse_error () if !($tmp eq '{'); -+ -+ add_dn_to_stack ("cn=$ip"); -+ $curentry{'type'} = 'subnet'; -+ $curentry{'ip'} = $ip; -+ $curentry{'netmask'} = $netmask; -+} -+ -+ -+sub parse_shared_network -+{ -+ local ($descr, $tmp); -+ -+ print_entry () if %curentry; -+ -+ $descr = next_token (0); -+ parse_error () if !defined ($descr); -+ -+ $tmp = next_token (0); -+ parse_error () if !defined ($tmp); -+ parse_error () if !($tmp eq '{'); -+ -+ add_dn_to_stack ("cn=$descr"); -+ $curentry{'type'} = 'shared-network'; -+ $curentry{'descr'} = $descr; -+} -+ -+ -+sub parse_host -+{ -+ local ($descr, $tmp); -+ -+ print_entry () if %curentry; -+ -+ $host = next_token (0); -+ parse_error () if !defined ($host); -+ -+ $tmp = next_token (0); -+ parse_error () if !defined ($tmp); -+ parse_error () if !($tmp eq '{'); -+ -+ add_dn_to_stack ("cn=$host"); -+ $curentry{'type'} = 'host'; -+ $curentry{'host'} = $host; -+} -+ -+ -+sub parse_group -+{ -+ local ($descr, $tmp); -+ -+ print_entry () if %curentry; -+ -+ $tmp = next_token (0); -+ parse_error () if !defined ($tmp); -+ parse_error () if !($tmp eq '{'); -+ -+ add_dn_to_stack ("cn=group"); -+ $curentry{'type'} = 'group'; -+} -+ -+ -+sub parse_pool -+{ -+ local ($descr, $tmp); -+ -+ print_entry () if %curentry; -+ -+ $tmp = next_token (0); -+ parse_error () if !defined ($tmp); -+ parse_error () if !($tmp eq '{'); -+ -+ add_dn_to_stack ("cn=pool"); -+ $curentry{'type'} = 'pool'; -+} -+ -+ -+sub parse_class -+{ -+ local ($descr, $tmp); -+ -+ print_entry () if %curentry; -+ -+ $class = next_token (0); -+ parse_error () if !defined ($class); -+ -+ $tmp = next_token (0); -+ parse_error () if !defined ($tmp); -+ parse_error () if !($tmp eq '{'); -+ -+ $class =~ s/\"//g; -+ add_dn_to_stack ("cn=$class"); -+ $curentry{'type'} = 'class'; -+ $curentry{'class'} = $class; -+} -+ -+ -+sub parse_subclass -+{ -+ local ($descr, $tmp); -+ -+ print_entry () if %curentry; -+ -+ $class = next_token (0); -+ parse_error () if !defined ($class); -+ -+ $subclass = next_token (0); -+ parse_error () if !defined ($subclass); -+ -+ $tmp = next_token (0); -+ parse_error () if !defined ($tmp); -+ parse_error () if !($tmp eq '{'); -+ -+ add_dn_to_stack ("cn=$subclass"); -+ $curentry{'type'} = 'subclass'; -+ $curentry{'class'} = $class; -+ $curentry{'subclass'} = $subclass; -+} -+ -+ -+sub parse_hwaddress -+{ -+ local ($type, $hw, $tmp); -+ -+ $type = next_token (0); -+ parse_error () if !defined ($type); -+ -+ $hw = next_token (0); -+ parse_error () if !defined ($hw); -+ $hw =~ s/;$//; -+ -+ $curentry{'hwaddress'} = "$type $hw"; -+} -+ -+ -+sub parse_range -+{ -+ local ($tmp, $str); -+ -+ $str = remaining_line (); -+ -+ if (!($str eq '')) -+ { -+ $str =~ s/;$//; -+ $curentry{'range'} = $str; -+ } -+} -+ -+ -+sub parse_statement -+{ -+ local ($token) = shift; -+ local ($str); -+ -+ if ($token eq 'option') -+ { -+ $str = remaining_line (); -+ push (@{$curentry{'options'}}, $str); -+ } -+ else -+ { -+ $str = $token . " " . remaining_line (); -+ push (@{$curentry{'statements'}}, $str); -+ } -+} -+ -+ -+my $token; -+my $token_number = 0; -+my $line_number = 0; -+my %curentry; -+ -+$current_dn = "cn=DHCP Config, $basedn"; -+$curentry{'descr'} = 'DHCP Config'; -+$line = ''; -+ -+while (($token = next_token (1))) -+ { -+ if ($token eq '}') -+ { -+ print_entry () if %curentry; -+ remove_dn_from_stack (); -+ } -+ elsif ($token eq 'subnet') -+ { -+ parse_subnet (); -+ next; -+ } -+ elsif ($token eq 'shared-network') -+ { -+ parse_shared_network (); -+ next; -+ } -+ elsif ($token eq 'class') -+ { -+ parse_class (); -+ next; -+ } -+ elsif ($token eq 'subclass') -+ { -+ parse_subclass (); -+ next; -+ } -+ elsif ($token eq 'pool') -+ { -+ parse_pool (); -+ next; -+ } -+ elsif ($token eq 'group') -+ { -+ parse_group (); -+ next; -+ } -+ elsif ($token eq 'host') -+ { -+ parse_host (); -+ next; -+ } -+ elsif ($token eq 'hardware') -+ { -+ parse_hwaddress (); -+ next; -+ } -+ elsif ($token eq 'range') -+ { -+ parse_range (); -+ next; -+ } -+ else -+ { -+ parse_statement ($token); -+ next; -+ } -+ } -+ -+ ---- /dev/null 2007-01-31 10:24:38.956568237 -0500 -+++ dhcp-3.0.5/doc/draft-ietf-dhc-ldap-schema-01.txt 2007-01-31 20:39:38.000000000 -0500 -@@ -0,0 +1,1089 @@ -+ -+ -+ -+ -+ -+Network Working Group M. Meredith, -+Internet Draft V. Nanjundaswamy, -+Document: M. Hinckley -+Category: Proposed Standard Novell Inc. -+Expires: 15th December 2001 16th June 2001 -+ -+ -+ LDAP Schema for DHCP -+ -+Status of this Memo -+ -+This document is an Internet-Draft and is in full conformance with all -+provisions of Section 10 of RFC2026 [ ]. -+ -+Internet-Drafts are working documents of the Internet Engineering Task -+Force (IETF), its areas, and its working groups. Note that other groups -+may also distribute working documents as Internet-Drafts. Internet- -+Drafts are draft documents valid for a maximum of six months and may be -+updated, replaced, or obsolete by other documents at any time. It is -+inappropriate to use Internet-Drafts as reference material or to cite -+them other than as "work in progress." The list of current Internet- -+Drafts can be accessed at http://www.ietf.org/ietf/1id-abstracts.txt The -+list of Internet-Draft Shadow Directories can be accessed at -+http://www.ietf.org/shadow.html. -+ -+1. Abstract -+ -+This document defines a schema for representing DHCP configuration in an -+LDAP directory. It can be used to represent the DHCP Service -+configuration(s) for an entire enterprise network, a subset of the -+network, or even a single server. Representing DHCP configuration in an -+LDAP directory enables centralized management of DHCP services offered -+by one or more DHCP Servers within the enterprise. -+ -+2. Conventions used in this document -+ -+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", -+"SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this -+document are to be interpreted as described in RFC-2119 [ ]. -+ -+In places where different sets of terminology are commonly used to -+represent similar DHCP concepts, this schema uses the terminology of the -+Internet Software Consortium's DHCP server reference implementation. -+For more information see www.isc.org. -+ -+3. Design Considerations -+ -+The DHCP LDAP schema is designed to be a simple multi-server schema. The -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 1] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+intent of this schema is to provide a basic framework for representing -+the most common elements used in the configuration of DHCP Server. This -+should allow other network services to obtain and use basic DHCP -+configuration information in a server-independent but knowledgeable way. -+ -+It is expected that some implementations may need to extend the schema -+objects, in order to implement all of their features or needs. It is -+recommended that you use the schema defined in this draft to represent -+DHCP configuration information in an LDAP directory. Conforming to a -+standard schema improves interoperability between DHCP implementations -+from different vendors. -+ -+Some implementations may choose not to support all of the objects -+defined here. -+ -+Two decisions are explicitly left up to each implementation: -+ -+First, implementations may choose not to store the lease information in -+the directory, so those objects would not be used. -+ -+Second, implementations may choose not to implement the auditing -+information. -+ -+It is up to the implementation to determine if the data in the directory -+is considered "authoritative", or if it is simply a copy of data from an -+authoritative source. Validity of the information if used as a copy is -+to be ensured by the implementation. -+ -+Primarily two types of applications will use the information in this -+schema: 1. DHCP servers (for loading their configuration) 2. Management -+Interfaces (for defining/editing configurations). -+ -+The schema should be efficient for the needs of both types of -+applications. The schema is designed to allow objects managed by DHCP -+(such as computers, subnets, etc) to be present anywhere in a directory -+hierarchy (to allow those objects to be placed in the directory for -+managing administrative control and access to the objects). -+ -+The schema uses a few naming conventions - all object classes and -+attributes are prefixed with "dhcp" to decrease the chance that object -+classes and attributes will have the same name. The schema also uses -+standard naming attributes ("cn", "ou", etc) for all objects. -+ -+4. Common DHCP Configuration Attributes -+ -+Although DHCP manages several different types of objects, the -+configuration of those objects is often similar. Consequently, most of -+these objects have a common set of attributes, which are defined below. -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 2] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+4.1. Attributes Definitions -+ -+The schema definitions listed below are for readability. The LDIF -+layout for this schema will follow in section 8. -+ -+Name: dhcpPrimaryDN Description: The Distinguished Name of the -+dhcpServer object, which is the primary server for the configuration. -+Syntax: DN Flags: SINGLE-VALUE -+ -+Named: dhcpSecondaryDN Description: The Distinguished Name(s) of the -+dhcpServer object(s), which are secondary servers for the configuration. -+Syntax: DN -+ -+Name: dhcpStatements Description: Flexible storage for representing any -+specific data depending on the object to which it is attached. Examples -+include conditional statements, Server parameters, etc. This also -+serves as a 'catch-all' attribute that allows the standard to evolve -+without needing to update the schema. Syntax: IA5String -+ -+Name: dhcpRange Description: The starting and ending IP Addresses in the -+range (inclusive), separated by a hyphen; if the range only contains one -+address, then just the address can be specified with no hyphen. Each -+range is defined as a separate value. Syntax: IA5String -+ -+Name: dhcpPermitList Description: This attribute contains the permit -+lists associated with a pool. Each permit list is defined as a separate -+value. Syntax: IA5String -+ -+Name: dhcpNetMask Description: The subnet mask length for the subnet. -+The mask can be easily computed from this length. Syntax: Integer -+Flags: SINGLE-VALUE -+ -+Name: dhcpOption Description: Encoded option values to be sent to -+clients. Each value represents a single option and contains (OptionTag, -+Length, OptionData) encoded in the format used by DHCP. For more -+information see [DHCPOPT]. Syntax: OctetString -+ -+Name: dhcpClassData Description: Encoded text string or list of bytes -+expressed in hexadecimal, separated by colons. Clients match subclasses -+based on matching the class data with the results of a 'match' or 'spawn -+with' statement in the class name declarations. Syntax: IA5String -+Flags: SINGLE-VALUE -+ -+Name: dhcpSubclassesDN Description: List of subclasses, these are the -+actual DN of each subclass object. Syntax: DN -+ -+Name: dhcpClassesDN Description: List of classes, these are the actual -+DN of each class object. Syntax: DN -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 3] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+Name: dhcpSubnetDN Description: List of subnets, these are the actual DN -+of each subnet object. Syntax: DN -+ -+Name: dhcpPoolDN Description: List of pools, these are the actual DN of -+each Pool object. Syntax: DN -+ -+Name: dhcpOptionsDN Description: List of options, these are the actual -+DN of each Options object. Syntax: DN -+ -+Name: dhcpHostDN Description: List of hosts, these are the actual DN of -+each host object. Syntax: DN -+ -+Name: dhcpSharedNetworkDN Description: List of shared networks, these -+are the actual DN of each shared network object. Syntax: DN -+ -+Name: dhcpGroupDN Description: List of groups, these are the actual DN -+of each Group object. Syntax: DN -+ -+Name: dhcpLeaseDN Description: Single Lease DN. A dhcpHost configuration -+uses this attribute to identify a static IP address assignment. Syntax: -+DN Flags: SINGLE-VALUE -+ -+Name: dhcpLeasesDN Description: List of leases, these are the actual DN -+of each lease object. Syntax: DN -+ -+Name: dhcpServiceDN Description: The DN of dhcpService object(s)which -+contain the configuration information. Each dhcpServer object has this -+attribute identifying the DHCP configuration(s) that the server is -+associated with. Syntax: DN -+ -+Name: dhcpHWAddress Description: The hardware address of the client -+associated with a lease Syntax: OctetString Flags: SINGLE-VALUE -+ -+Name: dhcpVersion Description: This is the version identified for the -+object that this attribute is part of. In case of the dhcpServer object, -+this represents the DHCP software version. Syntax: IA5String Flags: -+SINGLE-VALUE -+ -+Name: dhcpImplementation Description: DHCP Server implementation -+description e.g. DHCP Vendor information. Syntax: IA5String Flags: -+SINGLE-VALUE -+ -+Name: dhcpHashBucketAssignment Description: HashBucketAssignment bit map -+for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC -+3074]. Syntax: Octet String Flags: SINGLE-VALUE -+ -+Name: dhcpDelayedServiceParameter Description: Delay in seconds -+corresponding to Delayed Service Parameter configuration, as defined in -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 4] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+DHC Load Balancing Algorithm [RFC 3074]. Syntax: Integer Flags: SINGLE- -+VALUE -+ -+Name: dhcpMaxClientLeadTime Description: Maximum Client Lead Time -+configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR] -+Syntax: Integer Flags: SINGLE-VALUE -+ -+Name: dhcpFailOverEndpointState Description: Server (Failover Endpoint) -+state, as defined in DHCP Failover Protocol [FAILOVR] Syntax: IA5String -+Flags: SINGLE-VALUE -+ -+5. Configurations and Services -+ -+The schema definitions below are for readability the LDIF layout for -+this schema will follow in section 8. -+ -+The DHC working group is currently considering several proposals for -+fail-over and redundancy of DHCP servers. These may require sharing of -+configuration information between servers. This schema provides a -+generalized mechanism for supporting any of these proposals, by -+separating the definition of a server from the definition of -+configuration service provided by the server. -+ -+Separating the DHCP Server (dhcpServer) and the DHCP Configuration -+(dhcpService) representations allows a configuration service to be -+provided by one or more servers. Similarly, a server may provide one or -+more configurations. The schema allows a server to be configured as -+either a primary or secondary provider of a DHCP configuration. -+ -+Configurations are also defined so that one configuration can include -+some of the objects that are defined in another configuration. This -+allows for sharing and/or a hierarchy of related configuration items. -+ -+Name: dhcpService Description: Service object that represents the -+actual DHCP Service configuration. This will be a container with the -+following attributes. Must: cn, dhcpPrimaryDN May: dhcpSecondaryDN, -+dhcpSharedNetworkDN, dhcpSubnetDN, dhcpGroupDN, dhcpHostDN, -+dhcpClassesDN, dhcpOptionsDN, dhcpStatements -+ -+The following objects could exist inside the dhcpService container: -+dhcpSharedNetwork, dhcpSubnet, dhcpGroup, dhcpHost, dhcpClass, -+dhcpOptions, dhcpLog -+ -+Name: dhcpServer Description: Server object that the DHCP server will -+login as. The configuration information is in the dhcpService container -+that the dhcpServiceDN points to. Must: cn, dhcpServiceDN May: -+dhcpVersion, dhcpImplementation, dhcpHashBucketAssignment, -+dhcpDelayedServiceParameter, dhcpMaxClientLeadTime, -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 5] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+dhcpFailOverEndpointState, dhcpStatements -+ -+5.1. DHCP Declaration related classes: -+ -+Name: dhcpSharedNetwork Description: Shared Network class will list what -+pools and subnets are in this network. -+ -+This will be a container with the following attributes. Must: cn May: -+dhcpSubnetDN, dhcpPoolDN, dhcpOptionsDN, dhcpStatements -+ -+The following objects can exist within a dhcpSharedNetwork container: -+dhcpSubnet, dhcpPool, dhcpOptions, dhcpLog -+ -+Name: dhcpSubnet Description: Subnet object will include configuration -+information associated with a subnet, including a range and a net mask. -+ -+This will be a container with the following attributes. Must: cn -+(Subnet address), dhcpNetMask May: dhcpRange, dhcpPoolDN, dhcpGroupDN, -+dhcpHostDN, dhcpClassesDN, dhcpLeasesDN, dhcpOptionsDN, dhcpStatements -+ -+The following objects can exist within a dhcpSubnet container: dhcpPool, -+dhcpGroup, dhcpHost, dhcpClass, dhcpOptions, dhcpLease, dhcpLog -+ -+Name: dhcpGroup Description: Group object will have configuration -+information associated with a group. -+ -+This will be a container with the following attributes. Must: cn May: -+dhcpHostDN, dhcpOptionsDN, dhcpStatements -+ -+The following objects can exist within a dhcpGroup container: dhcpHost, -+dhcpOptions -+ -+Name: dhcpHost Description: The host object includes DHCP host -+declarations to assign a static IP address or declare the client as -+known or specify statements for a specific client. Must: cn May: -+dhcpLeaseDN, dhcpHWAddress, dhcpOptionsDN, dhcpStatements -+ -+The following objects can exist within a dhcpHost container: dhcpLease, -+dhcpOptions -+ -+Name: dhcpOptions Description: The options class is for option space -+declarations, it contains a list of options. Must: cn, dhcpOption -+ -+Name: dhcpClass Description: This is a class to group clients together -+based on matching rules. -+ -+This will be a container with the following attributes. Must: cn May: -+dhcpSubClassesDN, dhcpOptionsDN, dhcpStatements -+ -+The following object can exist within a dhcpClass container: -+dhcpSubclass, dhcpOptions -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 6] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+Name: dhcpSubClass Description: This includes configuration information -+for a subclass associated with a class. The dhcpSubClass object will -+always be contained within the corresponding class container object. -+Must: cn May: dhcpClassData, dhcpOptionsDN, dhcpStatements -+ -+Name: dhcpPool Description: This contains configuration for a pool that -+will have the range of addresses, permit lists and point to classes and -+leases that are members of this pool. -+ -+This will be a container that could be contained by dhcpSubnet or a -+dhcpSharedNetwork. Must: cn, dhcpRange May: dhcpClassesDN, -+dhcpPermitList, dhcpLeasesDN, dhcpOptionsDN, dhcpStatements -+ -+The following objects can exist within a dhcpPool container: dhcpClass, -+dhcpOptions, dhcpLease, dhcpLog -+ -+6. Tracking Address Assignments -+ -+The behavior of a DHCP server is influenced by two factors - it's -+configuration and the current state of the addresses that have been -+assigned to clients. This schema defines a set of objects for -+representing the DHCP configuration associated with a server. The -+following object classes provide the ability to record how addresses are -+used including maintaining history (audit log) on individual leases. -+Recording lease information in a directory could result in a significant -+performance impact and is therefore optional. Implementations supporting -+logging of leases need to consider the performance impact. -+ -+6.1. dhcpLeases Attribute Definitions -+ -+The schema definitions below are for readability the LDIF layout for -+this schema will follow in section 8. -+ -+Name: dhcpAddressState Description: This stores information about the -+current binding-status of an address. For dynamic addresses managed by -+DHCP, the values should be restricted to the states defined in the DHCP -+Failover Protocol draft [FAILOVR]: 'FREE', 'ACTIVE', 'EXPIRED', -+'RELEASED', 'RESET', 'ABANDONED', 'BACKUP'. For more information on -+these states see [FAILOVR]. For other addresses, it SHOULD be one of -+the following: 'UNKNOWN', 'RESERVED' (an address that is managed by DHCP -+that is reserved for a specific client), 'RESERVED-ACTIVE' (same as -+reserved, but address is currently in use), 'ASSIGNED' (assigned -+manually or by some other mechanism), 'UNASSIGNED', 'NOTASSIGNABLE'. -+Syntax: IA5String Flags: SINGLE-VALUE -+ -+Name: dhcpExpirationTime Description: This is the time the current lease -+for an address expires. Syntax: DateTime Flags: SINGLE-VALUE -+ -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 7] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+Name: dhcpStartTimeOfState Description: This is the time of the last -+state change for a leased address. Syntax: DateTime Flags: SINGLE-VALUE -+ -+Name: dhcpLastTransactionTime Description: This is the last time a valid -+DHCP packet was received from the client. Syntax: DateTime Flags: -+SINGLE-VALUE -+ -+Name: dhcpBootpFlag Description: This indicates whether the address was -+assigned via BOOTP Syntax: Boolean Flags: SINGLE-VALUE -+ -+Name: dhcpDomainName Description: This is the name of the domain sent to -+the client by the server. It is essentially the same as the value for -+DHCP option 15 sent to the client, and represents only the domain - not -+the full FQDN. To obtain the full FQDN assigned to the client you must -+prepend the "dhcpAssignedHostName" to this value with a ".". Syntax: -+IA5String Flags: SINGLE-VALUE -+ -+Name: dhcpDnsStatus Description: This indicates the status of updating -+DNS resource records on behalf of the client by the DHCP server for this -+address. The value is a 16-bit bitmask that has the same values as -+specified by the Failover-DDNS option (see [FAILOVR]). Syntax: Integer -+Flags: SINGLE-VALUE -+ -+Name: dhcpRequestedHostName Description: This is the hostname that was -+requested by the client. Syntax: IA5String Flags: SINGLE-VALUE -+ -+Name: dhcpAssignedHostName Description: This is the actual hostname that -+was assigned to a client. It may not be the name that was requested by -+the client. The fully qualified domain name can be determined by -+appending the value of "dhcpDomainName" (with a dot separator) to this -+name. Syntax: IA5String Flags: SINGLE-VALUE -+ -+Name: dhcpReservedForClient Description: This is the distinguished name -+of the "dhcpHost" that an address is reserved for. This may not be the -+same as the "dhcpAssignedToClient" attribute if the address is being -+reassigned but the current lease has not yet expired. Syntax: DN Flags: -+SINGLE-VALUE -+ -+Name: dhcpAssignedToClient Description: This is the distinguished name -+of a "dhcpHost" that an address is currently assigned to. This -+attribute is only present in the class when the address is leased. -+Syntax: DN Flags: SINGLE-VALUE -+ -+Name: dhcpRelayAgentInfo Description: If the client request was received -+via a relay agent, this contains information about the relay agent that -+was available from the DHCP request. This is a hex-encoded option -+value. Syntax: OctetString Flags: SINGLE-VALUE -+ -+Name: dhcpErrorLog Description: Generic error log attribute that allows -+logging error conditions within a dhcpService or a dhcpSubnet, like no IP -+addresses available for lease. Syntax: IA5String -+ -+M. Meredith et al. Expires December 2001 [Page 8] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+6.2. dhcpLeases Object Class -+ -+This class represents an IP address. It may or may not be leaseable, -+and the object may exist even though a lease is not currently active for -+the associated IP address. -+ -+It is recommended that all Lease objects for a single DHCP Service be -+centrally located within a single container. This ensures that the lease -+objects and the corresponding logs do not have to be relocated, when -+address ranges allocated to individual DHCP subnets and/or pools change. -+ -+The schema definitions below are for readability the LDIF layout for -+this schema will follow in section 8. -+ -+Name: dhcpLeases Description: This is the object that holds state -+information about an IP address. The cn (which is the IP address), and -+the current address-state are mandatory attributes. If the address is -+assigned then, some of the optional attributes will have valid data. -+Must: cn, dhcpAddressState May: dhcpExpirationTime, -+dhcpStartTimeOfState, dhcpLastTransactionTime, dhcpBootpFlag, -+dhcpDomainName, dhcpDnsStatus, dhcpRequestedHostName, -+dhcpAssignedHostName, dhcpReservedForClient, dhcpAssignedToClient, -+dhcpRelayAgentInfo, dhcpHWAddress -+ -+6.3 Audit Log Information -+ -+A dhcpLog object is created whenever a lease is assigned or released. -+This object is intended to be created under the corresponding dhcpLeases -+container, or dhcpPool, dhcpSubnet, dhcpSharedNetwork or dhcpService -+containers. -+ -+The log information under the dhcpLeases container would be for -+addresses matching that lease information. The log information in the -+other containers could be used for errors, i.e. when a pool or subnet is -+out our addresses or if a server is not able to assign any more -+addresses for a particular dhcpService. -+ -+Name: dhcpLog Description: This is the object that holds past -+information about an IP address. The cn is the time/date stamp when the -+address was assigned or released, the address state at the time, if the -+address was assigned or released. Must: cn May: dhcpAddressState, -+dhcpExpirationTime, dhcpStartTimeOfState, dhcpLastTransactionTime, -+dhcpBootpFlag, dhcpDomainName, dhcpDnsStatus, dhcpRequestedHostName, -+dhcpAssignedHostName, dhcpReservedForClient, dhcpAssignedToClient, -+dhcpRelayAgentInfo, dhcpHWAddress, dhcpErrorLog -+ -+ -+ -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 9] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+7. Determining settings -+ -+The dhcpStatements attribute is the key to DHC enhancements that may -+come along, and the different key words that a particular server -+implementation may use. This attribute can be used to hold conditional -+DHCP Statements and DHCP server parameters. Having a generic settings -+attribute that is just a string, allows this schema to be extensible and -+easy to configure. -+ -+All of the attributes that end with DN are references to the class that -+precedes the DN e.g. the dhcpPrimaryDN and dhcpSecondaryDN attributes -+hold the Distinguished Names of the dhcpServer objects that are -+associated with the dhcpService object. -+ -+8. LDIF format for attributes and classes. -+ -+# Attributes -+ -+( 2.16.840.1.113719.1.203.4.1 NAME 'dhcpPrimaryDN' DESC -+'The DN of the dhcpServer which is the primary server for the -+configuration.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.2 NAME 'dhcpSecondaryDN' DESC 'The DN of -+dhcpServer(s) which provide backup service for the configuration.' -+SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.3 NAME 'dhcpStatements' DESC 'Flexible -+storage for specific data depending on what object this exists in. Like -+conditional statements, server parameters, etc. This allows the standard -+to evolve without needing to adjust the schema.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.26 ) -+ -+( 2.16.840.1.113719.1.203.4.4 NAME 'dhcpRange' DESC 'The starting & -+ending IP Addresses in the range (inclusive), separated by a hyphen; if -+the range only contains one address, then just the address can be -+specified with no hyphen. Each range is defined as a separate value.' -+SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) -+ -+( 2.16.840.1.113719.1.203.4.5 NAME 'dhcpPermitList' DESC 'This attribute -+contains the permit lists associated with a pool. Each permit list is -+defined as a separate value.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) -+ -+( 2.16.840.1.113719.1.203.4.6 NAME 'dhcpNetMask' DESC 'The subnet mask -+length for the subnet. The mask can be easily computed from this -+length.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.7 NAME 'dhcpOption' DESC 'Encoded option -+values to be sent to clients. Each value represents a single option and -+contains (OptionTag, Length, OptionValue) encoded in the format used by -+DHCP.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) -+ -+M. Meredith et al. Expires December 2001 [Page 10] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+( 2.16.840.1.113719.1.203.4.8 NAME 'dhcpClassData' DESC 'Encoded text -+string or list of bytes expressed in hexadecimal, separated by colons. -+Clients match subclasses based on matching the class data with the -+results of match or spawn with statements in the class name -+declarations.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.9 NAME 'dhcpOptionsDN' DESC 'The -+distinguished name(s) of the dhcpOption objects containing the -+configuration options provided by the server.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.10 NAME 'dhcpHostDN' DESC 'the distinguished -+name(s) of the dhcpHost objects.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.11 NAME 'dhcpPoolDN' DESC 'The distinguished -+name(s) of pools.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.12 NAME 'dhcpGroupDN' DESC 'The -+distinguished name(s) of the groups.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.13 NAME 'dhcpSubnetDN' DESC 'The -+distinguished name(s) of the subnets.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.14 NAME 'dhcpLeaseDN' DESC 'The -+distinguished name of a client address.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE) -+ -+( 2.16.840.1.113719.1.203.4.15 NAME 'dhcpLeasesDN' DESC 'The -+distinguished name(s) client addresses.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.16 NAME 'dhcpClassesDN' DESC 'The -+distinguished name(s) of a class(es) in a subclass.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.17 NAME 'dhcpSubclassesDN' DESC 'The -+distinguished name(s) of subclass(es).' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.18 NAME 'dhcpSharedNetworkDN' DESC 'The -+distinguished name(s) of sharedNetworks.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.19 NAME 'dhcpServiceDN' DESC 'The DN of -+dhcpService object(s)which contain the configuration information. Each -+dhcpServer object has this attribute identifying the DHCP -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 11] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+configuration(s) that the server is associated with.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.12 ) -+ -+( 2.16.840.1.113719.1.203.4.20 NAME 'dhcpVersion' DESC 'The version -+attribute of this object.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE- -+VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.21 NAME 'dhcpImplementation' DESC -+'Description of the DHCP Server implementation e.g. DHCP Server's -+vendor.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.22 NAME 'dhcpAddressState' DESC 'This stores -+information about the current binding-status of an address. For dynamic -+addresses managed by DHCP, the values should be restricted to the -+following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", -+"ABANDONED", "BACKUP". For other addresses, it SHOULD be one of the -+following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP -+that is reserved for a specific client), "RESERVED-ACTIVE" (same as -+reserved, but address is currently in use), "ASSIGNED" (assigned -+manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".' -+SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.23 NAME 'dhcpExpirationTime' DESC 'This is -+the time the current lease for an address expires.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.24 NAME 'dhcpStartTimeOfState' DESC 'This is -+the time of the last state change for a leased address.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.25 NAME 'dhcpLastTransactionTime' DESC 'This -+is the last time a valid DHCP packet was received from the client.' -+SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.26 NAME 'dhcpBootpFlag' DESC 'This indicates -+whether the address was assigned via BOOTP.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.27 NAME 'dhcpDomainName' DESC 'This is the -+name of the domain sent to the client by the server. It is essentially -+the same as the value for DHCP option 15 sent to the client, and -+represents only the domain - not the full FQDN. To obtain the full FQDN -+assigned to the client you must prepend the "dhcpAssignedHostName" to -+this value with a ".".' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE- -+VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.28 NAME 'dhcpDnsStatus' DESC 'This indicates -+the status of updating DNS resource records on behalf of the client by -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 12] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+the DHCP server for this address. The value is a 16-bit bitmask.' -+SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.29 NAME 'dhcpRequestedHostName' DESC 'This -+is the hostname that was requested by the client.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.30 NAME 'dhcpAssignedHostName' DESC 'This is -+the actual hostname that was assigned to a client. It may not be the -+name that was requested by the client. The fully qualified domain name -+can be determined by appending the value of "dhcpDomainName" (with a dot -+separator) to this name.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE- -+VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.31 NAME 'dhcpReservedForClient' DESC 'The -+distinguished name of a "dhcpClient" that an address is reserved for. -+This may not be the same as the "dhcpAssignedToClient" attribute if the -+address is being reassigned but the current lease has not yet expired.' -+SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.32 NAME 'dhcpAssignedToClient' DESC 'This is -+the distinguished name of a "dhcpClient" that an address is currently -+assigned to. This attribute is only present in the class when the -+address is leased.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.33 NAME 'dhcpRelayAgentInfo' DESC 'If the -+client request was received via a relay agent, this contains information -+about the relay agent that was available from the DHCP request. This is -+a hex-encoded option value.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 -+SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.34 NAME 'dhcpHWAddress' DESC 'The clients -+hardware address that requested this IP address.' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.35 NAME 'dhcpHashBucketAssignment' DESC -+'HashBucketAssignment bit map for the DHCP Server, as defined in DHC -+Load Balancing Algorithm [RFC 3074].' SYNTAX -+1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.36 NAME 'dhcpDelayedServiceParameter' DESC -+'Delay in seconds corresponding to Delayed Service Parameter -+configuration, as defined in DHC Load Balancing Algorithm [RFC 3074]. ' -+SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.37 NAME 'dhcpMaxClientLeadTime' DESC -+'Maximum Client Lead Time configuration in seconds, as defined in DHCP -+Failover Protocol [FAILOVR]' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 13] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.38 NAME 'dhcpFailOverEndpointState' DESC -+'Server (Failover Endpoint) state, as defined in DHCP Failover Protocol -+[FAILOVR]' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -+ -+( 2.16.840.1.113719.1.203.4.39 NAME 'dhcpErrorLog' DESC -+Generic error log attribute that allows logging error conditions within a -+dhcpService or a dhcpSubnet, like no IP addresses available for lease. -+SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -+ -+#Classes -+ -+( 2.16.840.1.113719.1.203.6.1 NAME 'dhcpService' DESC ' Service object -+that represents the actual DHCP Service configuration. This is a -+container object.' SUP top MUST (cn $ dhcpPrimaryDN) MAY -+(dhcpSecondaryDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpGroupDN $ -+dhcpHostDN $ dhcpClassesDN $ dhcpOptionsDN $ dhcpStatements ) ) -+ -+( 2.16.840.1.113719.1.203.6.2 NAME 'dhcpSharedNetwork' DESC 'This stores -+configuration information for a shared network.' SUP top MUST cn MAY -+(dhcpSubnetDN $ dhcpPoolDN $ dhcpOptionsDN $ dhcpStatements) X- -+NDS_CONTAINMENT ('dhcpService' ) ) -+ -+( 2.16.840.1.113719.1.203.6.3 NAME 'dhcpSubnet' DESC 'This class defines -+a subnet. This is a container object.' SUP top MUST ( cn $ dhcpNetMask ) -+MAY (dhcpRange $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ -+dhcpLeasesDN $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT -+('dhcpService' 'dhcpSharedNetwork') ) -+ -+( 2.16.840.1.113719.1.203.6.4 NAME 'dhcpPool' DESC 'This stores -+configuration information about a pool.' SUP top MUST ( cn $ dhcpRange ) -+MAY (dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ -+dhcpStatements) X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') ) -+ -+( 2.16.840.1.113719.1.203.6.5 NAME 'dhcpGroup' DESC 'Group object that -+lists host DNs and parameters. This is a container object.' SUP top MUST -+cn MAY ( dhcpHostDN $ dhcpOptionsDN $ dhcpStatements ) X-NDS_CONTAINMENT -+('dhcpSubnet' 'dhcpService' ) ) -+ -+( 2.16.840.1.113719.1.203.6.6 NAME 'dhcpHost' DESC 'This represents -+information about a particular client' SUP top MUST cn MAY (dhcpLeaseDN -+$ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT -+('dhcpService' 'dhcpSubnet' 'dhcpGroup') ) -+ -+( 2.16.840.1.113719.1.203.6.7 NAME 'dhcpClass' DESC 'Represents -+information about a collection of related clients.' SUP top MUST cn MAY -+(dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT -+('dhcpService' 'dhcpSubnet' ) ) -+ -+( 2.16.840.1.113719.1.203.6.8 NAME 'dhcpSubClass' DESC 'Represents -+information about a collection of related classes.' SUP top MUST cn MAY -+(dhcpClassData $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 14] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+'dhcpClass' ) -+ -+( 2.16.840.1.113719.1.203.6.9 NAME 'dhcpOptions' DESC 'Represents -+information about a collection of options defined.' SUP top MUST cn MAY -+( dhcpOption ) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' -+'dhcpSubnet' 'dhcpPool' 'dhcpGroup' 'dhcpHost' 'dhcpClass' ) -+ -+( 2.16.840.1.113719.1.203.6.10 NAME 'dhcpLeases' DESC 'This class -+represents an IP Address, which may or may not have been leased.' SUP -+top MUST ( cn $ dhcpAddressState ) MAY ( dhcpExpirationTime $ -+dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ -+dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ -+dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ -+dhcpRelayAgentInfo $ dhcpHWAddress ) X-NDS_CONTAINMENT ( 'dhcpService' -+'dhcpSubnet' 'dhcpPool') ) -+ -+( 2.16.840.1.113719.1.203.6.11 NAME 'dhcpLog' DESC 'This is the object -+that holds past information about the IP address. The cn is the -+time/date stamp when the address was assigned or released, the address -+state at the time, if the address was assigned or released.' SUP top -+MUST ( cn ) MAY ( dhcpAddressState $ dhcpExpirationTime $ -+dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ -+dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ -+dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ -+dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog) X-NDS_CONTAINMENT -+('dhcpLeases' 'dhcpPool' 'dhcpSubnet' 'dhcpSharedNetwork' 'dhcpService' ) ) -+ -+( 2.16.840.1.113719.1.203.6.12 NAME 'dhcpServer' DESC 'DHCP Server -+Object' SUP top MUST (cn, dhcpServiceDN) MAY (dhcpVersion $ -+dhcpImplementation $ dhcpHashBucketAssignment $ -+dhcpDelayedServiceParameter $ dhcpMaxClientLeadTime $ -+dhcpFailOverEndpointState $ dhcpStatements) X-NDS_CONTAINMENT ('O' 'OU' -+'dc') ) -+ -+9. Security Considerations -+ -+Since the DHCP Configuration information is stored in a directory, the -+security of the information is limited to the security offered by the -+directory including the security of the objects within that directory. -+ -+10. Intellectual Property Rights Notices -+ -+The IETF takes no position regarding the validity or scope of any -+intellectual property or other rights that might be claimed to pertain -+to the implementation or use of the technology described in this -+document or the extent to which any license under such rights might or -+might not be available; neither does it represent that it has made any -+effort to identify any such rights. Information on the IETF's -+procedures with respect to rights in standards-track and standards- -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 15] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+related documentation can be found in BCP-11. Copies of claims of -+rights made available for publication and any assurances of licenses to -+be made available, or the result of an attempt made to obtain a general -+license or permission for the use of such proprietary rights by -+implementors or users of this specification can be obtained from the -+IETF Secretariat. -+ -+The IETF invites any interested party to bring to its attention any -+copyrights, patents or patent applications, or other proprietary rights -+which may cover technology that may be required to practice this -+standard. Please address the information to the IETF Executive -+Director. -+ -+11. Full Copyright Statement -+ -+Copyright (C) The Internet Society (2001). All Rights Reserved. -+ -+This document and translations of it may be copied and furnished to -+others, and derivative works that comment on or otherwise explain it or -+assist in its implementation may be prepared, copied, published and -+distributed, in whole or in part, without restriction of any kind, -+provided that the above copyright notice and this paragraph are included -+on all such copies and derivative works. However, this document itself -+may not be modified in any way, such as by removing the copyright notice -+or references to the Internet Society or other Internet organizations, -+except as needed for the purpose of developing Internet standards in -+which case the procedures for copyrights defined in the Internet -+Standards process must be followed, or as required to translate it into -+languages other than English. -+ -+The limited permissions granted above are perpetual and will not be -+revoked by the Internet Society or its successors or assigns. -+ -+This document and the information contained herein is provided on an "AS -+IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING TASK -+FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT -+LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT -+INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR -+FITNESS FOR A PARTICULAR PURPOSE. -+ -+12. References -+ -+[RFC2131] Droms, R., "Dynamic Host Configuration Protocol", RFC 2131, -+March 1997. -+ -+[RFC2132] Alexander, S., Droms, R., "DHCP Options and BOOTP Vendor -+Extensions", RFC 2132, March 1997. -+ -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 16] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+[MSDHCP] Gu, Y., Vyaghrapuri, R., "An LDAP Schema for Dynamic Host -+Configuration Protocol Service", Internet Draft , August 1998. -+ -+[NOVDHCP] Miller, T., Patel, A., Rao, P., "Lightweight Directory Access -+Protocol (v3): Schema for Dynamic Host Configuration Protocol (DHCP)", -+Internet Draft , June 1998. -+ -+[FAILOVR] Droms, R., Rabil, G., Dooley, M., Kapur, A., Gonczi, S., Volz, -+B., "DHCP Failover Protocol", Internet Draft , July 2000. -+ -+[RFC 3074] Volz B., Gonczi S., Lemon T., Stevens R., "DHC Load Balancing -+Algorithm", February 2001 -+ -+[AGENT] Patrick, M., "DHCP Relay Agent Information Option", Internet -+Draft , March 2000. -+ -+[DHCPOPT] Carney, M., "New Option Review Guidelines and Additional -+Option Namespace", Internet Draft , October 1999. -+ -+[POLICY] Strassner, J., Elleson, E., Moore, B., "Policy Framework LDAP -+Core Schema", Internet Draft , -+November 1999. -+ -+[RFC2251] Wahl, M., Howes, T., Kille, S., "Lightweight Directory Access -+Protocol (v3)", RFC 2251, December 1997. -+ -+[RFC2252] Wahl, M., Coulbeck, A., Howes, T., Kille, S., "Lightweight -+Directory Access Protocol (v3) Attribute Syntax Definitions", RFC 2252, -+December 1997. -+ -+[RFC2255] Howes, T., Smith, M., "The LDAP URL Format", RFC 2255, -+December 1997. -+ -+[RFC951] Croft, B., Gilmore, J., "Bootstrap Protocol (BOOTP)", RFC 951, -+September 1985. -+ -+[RFC2119] Bradner, S. "Key words for use in RFCs to Indicate Requirement -+Levels", RFC 2119, March 1997. -+ -+13. Acknowledgments -+ -+This work is partially based on a previous draft draft-ietf-dhc- -+schema-02.doc. -+ -+ -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 17] -+ -+ -+ -+ -+ -+INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 -+ -+ -+14. Author's Addresses -+ -+Comments regarding this draft may be sent to the authors at the -+following address: -+ -+Mark Meredith -+Mark Hinckley -+Novell Inc. -+1800 S. Novell Place -+Provo, Utah 84606 -+ -+Vijay K. Nanjundaswamy -+Novell Software Development (I) Ltd -+49/1 & 49/3, Garvebhavi Palya, -+7th Mile, Hosur Road -+Bangalore 560068 -+ -+email: mark_meredith at novell.com -+email: knvijay at novell.com -+email: mhinckley at novell.com -+ -+This Internet Draft expires December 16, 2001. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+M. Meredith et al. Expires December 2001 [Page 18] -+ -+ -+ -+ ---- dhcp-3.0.5/includes/dhcpd.h.ldapconf 2007-01-31 20:39:38.000000000 -0500 -+++ dhcp-3.0.5/includes/dhcpd.h 2007-01-31 20:39:38.000000000 -0500 +--- dhcp-3.0.5/includes/dhcpd.h.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/includes/dhcpd.h 2007-03-04 15:32:24.000000000 -0500 @@ -79,6 +79,11 @@ #include #include @@ -1791,7 +179,7 @@ +#endif + --- dhcp-3.0.5/includes/site.h.ldapconf 2002-03-12 13:33:39.000000000 -0500 -+++ dhcp-3.0.5/includes/site.h 2007-01-31 20:39:38.000000000 -0500 ++++ dhcp-3.0.5/includes/site.h 2007-03-04 15:32:24.000000000 -0500 @@ -177,3 +177,13 @@ traces. */ @@ -1806,8 +194,8 @@ +#define _PATH_DHCLIENT_DB "/var/lib/dhclient/dhclient.leases" +#define _PATH_DHCPD_DB "/var/lib/dhcpd/dhcpd.leases" +#define _PATH_DHCLIENT_DB "/var/lib/dhclient/dhclient.leases" ---- dhcp-3.0.5/server/Makefile.dist.ldapconf 2007-01-31 20:39:38.000000000 -0500 -+++ dhcp-3.0.5/server/Makefile.dist 2007-01-31 21:00:06.000000000 -0500 +--- dhcp-3.0.5/server/Makefile.dist.ldapconf 2004-06-10 13:59:50.000000000 -0400 ++++ dhcp-3.0.5/server/Makefile.dist 2007-03-04 15:33:01.000000000 -0500 @@ -25,9 +25,9 @@ CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5 @@ -1824,12 +212,12 @@ -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5 dhcpd: $(OBJS) $(COBJ) $(DHCPLIB) -- $(CC) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) -+ $(CC) $(LFLAGS) -pie $(RPM_OPT_FLAGS) -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) -lldap +- $(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) ++ $(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) -lldap # Dependencies (semi-automatically-generated) --- dhcp-3.0.5/server/class.c.ldapconf 2004-06-10 13:59:51.000000000 -0400 -+++ dhcp-3.0.5/server/class.c 2007-01-31 20:39:38.000000000 -0500 ++++ dhcp-3.0.5/server/class.c 2007-03-04 15:32:24.000000000 -0500 @@ -90,6 +90,7 @@ int matched = 0; int status; @@ -1861,8 +249,8 @@ #if defined (DEBUG_CLASS_MATCHING) log_info ("matches subclass %s.", print_hex_1 (data.len, ---- dhcp-3.0.5/server/confpars.c.ldapconf 2007-01-31 20:39:38.000000000 -0500 -+++ dhcp-3.0.5/server/confpars.c 2007-01-31 20:39:38.000000000 -0500 +--- dhcp-3.0.5/server/confpars.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/server/confpars.c 2007-03-04 15:32:24.000000000 -0500 @@ -63,7 +63,17 @@ isc_result_t readconf () @@ -1882,8 +270,8 @@ } isc_result_t read_conf_file (const char *filename, struct group *group, ---- dhcp-3.0.5/server/dhcpd.c.ldapconf 2007-01-31 20:39:38.000000000 -0500 -+++ dhcp-3.0.5/server/dhcpd.c 2007-01-31 20:39:38.000000000 -0500 +--- dhcp-3.0.5/server/dhcpd.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/server/dhcpd.c 2007-03-04 15:32:24.000000000 -0500 @@ -433,6 +433,9 @@ /* Add the ddns update style enumeration prior to parsing. */ add_enumeration (&ddns_styles); @@ -1894,8 +282,8 @@ if (!group_allocate (&root_group, MDL)) log_fatal ("Can't allocate root group!"); ---- /dev/null 2007-01-31 10:24:38.956568237 -0500 -+++ dhcp-3.0.5/server/ldap.c 2007-01-31 20:39:38.000000000 -0500 +--- /dev/null 2007-03-03 18:04:36.394738328 -0500 ++++ dhcp-3.0.5/server/ldap.c 2007-03-04 15:32:24.000000000 -0500 @@ -0,0 +1,1142 @@ +/* ldap.c + @@ -3039,8 +1427,8 @@ + +#endif + ---- dhcp-3.0.5/server/mdb.c.ldapconf 2007-01-31 20:39:38.000000000 -0500 -+++ dhcp-3.0.5/server/mdb.c 2007-01-31 20:39:38.000000000 -0500 +--- dhcp-3.0.5/server/mdb.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/server/mdb.c 2007-03-04 15:32:24.000000000 -0500 @@ -373,6 +373,12 @@ const char *file, int line) { @@ -3055,7 +1443,7 @@ h.hlen = hlen + 1; h.hbuf [0] = htype; --- dhcp-3.0.5/server/stables.c.ldapconf 2004-06-10 13:59:58.000000000 -0400 -+++ dhcp-3.0.5/server/stables.c 2007-01-31 20:39:38.000000000 -0500 ++++ dhcp-3.0.5/server/stables.c 2007-03-04 15:32:24.000000000 -0500 @@ -483,12 +483,21 @@ { "log-facility", "Nsyslog-facilities.", &server_universe, 44 }, { "do-forward-updates", "f", &server_universe, 45 }, @@ -3099,175 +1487,3 @@ struct enumeration_value ddns_styles_values [] = { { "none", 0 }, { "ad-hoc", 1 }, ---- /dev/null 2007-01-31 10:24:38.956568237 -0500 -+++ dhcp-3.0.5/README.ldap 2007-01-31 20:39:38.000000000 -0500 -@@ -0,0 +1,157 @@ -+LDAP Support in DHCP -+Brian Masney -+Last updated 8/16/2002 -+ -+This document describes setting up the DHCP server to read it's configuration -+from LDAP. This work is based on the IETF document -+draft-ietf-dhc-ldap-schema-01.txt included in the doc directory. For the latest -+version of this document, please see http://home.ntelos.net/~masneyb. -+ -+First question on most people's mind is "Why do I want to store my -+configuration in LDAP?" If you run a small DHCP server, and the configuration -+on it rarely changes, then you won't need to store your configuration in LDAP. -+But, if you have several DHCP servers, and you want an easy way to manage your -+configuration, this can be a solution. -+ -+The first step will be to setup your LDAP server. I am using OpenLDAP from -+www.openldap.org. Building and installing OpenLDAP is beyond the scope of this -+document. There is plenty of documentation out there about this. Once you have -+OpenLDAP installed, you will have to edit your slapd.conf file. I added the -+following 2 lines to my configuration file: -+ -+include /etc/ldap/schema/dhcp.schema -+index dhcpHWAddress eq -+index dhcpClassData eq -+ -+The first line tells it to include the dhcp schema file. You will find this -+file under the contrib directory in this distribution. You will need to copy -+this file to where your other schema files are (maybe -+/usr/local/openldap/etc/openldap/schema/). The second line sets up -+an index for the dhcpHWAddress parameter. The third parameter is for reading -+subclasses from LDAP every time a DHCP request comes in. Make sure you run the -+slapindex command and restart slapd to have these changes to into effect. -+ -+Now that you have LDAP setup, you should be able to use gq (http://biot.com/gq/) -+to verify that the dhcp schema file is loaded into LDAP. Pull up gq, and click -+on the Schema tab. Go under objectClasses, and you should see at least the -+following object classes listed: dhcpClass, dhcpGroup, dhcpHost, dhcpOptions, -+dhcpPool, dhcpServer, dhcpService, dhcpSharedNetwork, dhcpSubClass, and -+dhcpSubnet. If you do not see these, you need to check over your LDAP -+configuration before you go any further. -+ -+You should be ready to build DHCP. Edit the includes/site.h file and uncomment -+the #define LDAP_CONFIGURATION. Now run configure in the base source directory. -+Edit the work.os/server/Makefile and add -lldap to the LIBS= line. (replace os -+with your operating system, linux-2.2 on my machine). You should be able to -+type make to build your DHCP server. -+ -+Once you have DHCP installed, you will need to setup your initial plaintext -+config file. In my /etc/dhcpd.conf file, I have: -+ -+ldap-server "localhost"; -+ldap-port 389; -+ldap-username "cn=DHCP User, dc=ntelos, dc=net"; -+ldap-password "blah"; -+ldap-base-dn "dc=ntelos, dc=net"; -+ldap-method dynamic; -+ -+All of these parameters should be self explanatory except for the ldap-method. -+You can set this to static or dynamic. If you set it to static, the -+configuration is read once on startup, and LDAP isn't used anymore. But, if you -+set this to dynamic, the configuration is read once on startup, and the -+hosts that are stored in LDAP are looked up every time a DHCP request comes in. -+ -+The next step is to set up your LDAP tree. Here is an example config that will -+give a 10.100.0.x address to machines that have a host entry in LDAP. -+Otherwise, it will give a 10.200.0.x address to them. (NOTE: replace -+dc=ntelos, dc=net with your base dn). If you would like to convert your -+existing dhcpd.conf file to LDIF format, there is a script -+contrib/dhcpd-conf-to-ldap.pl that will convert it for you. -+ -+# You must specify the server's host name in LDAP that you are going to run -+# DHCP on and point it to which config tree you want to use. Whenever DHCP -+# first starts up, it will do a search for this entry to find out which -+# config to use -+dn: cn=brian.ntelos.net, dc=ntelos, dc=net -+objectClass: top -+objectClass: dhcpServer -+cn: brian.ntelos.net -+dhcpServiceDN: cn=DHCP Service Config, dc=ntelos, dc=net -+ -+# Here is the config tree that brian.ntelos.net points to. -+dn: cn=DHCP Service Config, dc=ntelos, dc=net -+cn: DHCP Service Config -+objectClass: top -+objectClass: dhcpService -+dhcpPrimaryDN: dc=ntelos, dc=net -+dhcpStatements: ddns-update-style ad-hoc -+dhcpStatements: default-lease-time 600 -+dhcpStatements: max-lease-time 7200 -+ -+# Set up a shared network segment -+dn: cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net -+cn: WV -+objectClass: top -+objectClass: dhcpSharedNetwork -+ -+# Set up a subnet declaration with a pool statement. Also note that we have -+# a dhcpOptions object with this entry -+dn: cn=10.100.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net -+cn: 10.100.0.0 -+objectClass: top -+objectClass: dhcpSubnet -+objectClass: dhcpOptions -+dhcpOption: domain-name-servers 10.100.0.2 -+dhcpOption: routers 10.100.0.1 -+dhcpOption: subnet-mask 255.255.255.0 -+dhcpOption: broadcast-address 10.100.0.255 -+dhcpNetMask: 24 -+ -+# Set up a pool for this subnet. Only known hosts will get these IPs -+dn: cn=Known Pool, cn=10.100.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net -+cn: Known Pool -+objectClass: top -+objectClass: dhcpPool -+dhcpRange: 10.100.0.3 10.100.0.254 -+dhcpPermitList: deny unknown-clients -+ -+# Set up another subnet declaration with a pool statement -+dn: cn=10.200.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net -+cn: 10.200.0.0 -+objectClass: top -+objectClass: dhcpSubnet -+objectClass: dhcpOptions -+dhcpOption: domain-name-servers 10.200.0.2 -+dhcpOption: routers 10.200.0.1 -+dhcpOption: subnet-mask 255.255.255.0 -+dhcpOption: broadcast-address 10.200.0.255 -+dhcpNetMask: 24 -+ -+# Set up a pool for this subnet. Only unknown hosts will get these IPs -+dn: cn=Known Pool, cn=10.200.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net -+cn: Known Pool -+objectClass: top -+objectClass: dhcpPool -+dhcpRange: 10.200.0.3 10.200.0.254 -+dhcpPermitList: deny known clients -+ -+# Set aside a group for all of our known MAC addresses -+dn: cn=Customers, cn=DHCP Service Config, dc=ntelos, dc=net -+objectClass: top -+objectClass: dhcpGroup -+cn: Customers -+ -+# Host entry for my laptop -+dn: cn=brianlaptop, cn=Customers, cn=DHCP Service Config, dc=ntelos, dc=net -+objectClass: top -+objectClass: dhcpHost -+cn: brianlaptop -+dhcpHWAddress: ethernet 00:00:00:00:00:00 -+ -+You can use the command slapadd to load all of these entries into your LDAP -+server. After you load this, you should be able to start up DHCP. If you run -+into problems reading the configuration, try running dhcpd with the -d flag. -+If you still have problems, edit the site.conf file in the DHCP source and -+add the line: COPTS= -DDEBUG_LDAP and recompile DHCP. (make sure you run make -+clean and rerun configure before you rebuild). -+ ---- dhcp-3.0.5/site.conf.ldapconf 1999-07-07 11:20:10.000000000 -0400 -+++ dhcp-3.0.5/site.conf 2007-01-31 20:39:38.000000000 -0500 -@@ -1,2 +1,7 @@ --# Put local site configuration stuff here to override the default --# settings in Makefile.conf -+VARDB=/var/lib/dhcpd -+ADMMANDIR=/usr/share/man/man8 -+FFMANDIR=/usr/share/man/man5 -+LIBMANDIR=/usr/share/man/man3 -+USRMANDIR=/usr/share/man/man1 -+LIBDIR=/usr/lib -+INCDIR=/usr/include Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- dhcp.spec 28 Feb 2007 11:36:49 -0000 1.144 +++ dhcp.spec 5 Mar 2007 16:02:22 -0000 1.145 @@ -3,12 +3,14 @@ %define bigptrs -DPTRSIZE_64BIT %endif +# The workdir is used in the build system for ISC dhcp, we set it to this +# value to avoid any problems guessing what it might be during installation. %define workdir work.linux-2.2 Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Name: dhcp Version: 3.0.5 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 12 License: ISC Group: System Environment/Daemons @@ -19,6 +21,10 @@ Source3: dhcrelay.init Source4: dhcpd.conf Source5: libdhcp4client.pc +Source6: README.ldap +Source7: draft-ietf-dhc-ldap-schema-01.txt +Source8: dhcpd-conf-to-ldap.pl +Source9: linux.dbus-example Patch0: dhcp-3.0.5-extended-new-option-info.patch Patch1: dhcp-3.0.5-Makefile.patch @@ -35,11 +41,13 @@ Patch12: dhcp-3.0.5-fix-warnings.patch Patch13: dhcp-3.0.5-xen-checksum.patch Patch14: dhcp-3.0.5-ldap-configuration.patch +Patch15: dhcp-3.0.5-no-win32.patch # adds libdhcp4client to the ISC code base Patch50: dhcp-3.0.5-libdhcp4client.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: perl Requires(post): chkconfig, coreutils Requires(preun): chkconfig Requires(postun): coreutils @@ -150,12 +158,28 @@ # Add support for dhcpd.conf data in LDAP %patch14 -p1 -b .ldapconf +# The contrib/ms2isc/Registry.pm file requires Win32API::Registry, which is +# not part of Fedora by default. We comment out this use line in the script +# so that RPM doesn't automatically add perl(Win32API::Registry) dependency. +# The patch puts a comment in the script telling the user which perl module +# should be installed to use the Registry.pm contrib file. +%patch15 -p1 -b .no-win32 + # Add the libdhcp4client target (library version of dhclient) %patch50 -p1 -b .libdhcp4client +# Copy in documentation and example scripts for LDAP patch to dhcpd +%{__cp} -p %SOURCE6 . +%{__cp} -p %SOURCE7 doc +%{__cp} -p %SOURCE8 contrib + +# Copy in example dhclient script for use with D-BUS (requires extended +# new option info patch too) +%{__cp} -p %SOURCE9 client/scripts + %build -cp %SOURCE1 . -cat <site.conf +%{__cp} %SOURCE1 . +%{__cat} < site.conf VARDB=%{_localstatedir}/lib/dhcpd ADMMANDIR=%{_mandir}/man8 FFMANDIR=%{_mandir}/man5 @@ -164,12 +188,15 @@ LIBDIR=%{_libdir} INCDIR=%{_includedir} EOF -cat <>includes/site.h +%{__cat} <> includes/site.h #define _PATH_DHCPD_DB "%{_localstatedir}/lib/dhcpd/dhcpd.leases" #define _PATH_DHCLIENT_DB "%{_localstatedir}/lib/dhclient/dhclient.leases" EOF -# Enable extended option info patch +# Enable extended option info patch (-DEXTENDED_NEW_OPTION_INFO) +# Use -fvisibility=hidden for libdhcp4client. The way that library is +# constructed, we need to follow the hide-by-default/expose-what-we-need +# plan for the library API. COPTS="-fPIC -Werror -Dlint -DEXTENDED_NEW_OPTION_INFO -fvisibility=hidden" # DO NOT use the %%configure macro because this configure script is not autognu @@ -177,61 +204,55 @@ --copts "$RPM_OPT_FLAGS $COPTS %{?bigptrs}" \ --work-dir %{workdir} -sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE5 > libdhcp4client.pc +%{__sed} 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE5 > libdhcp4client.pc %{__make} %{?_smp_mflags} CC="%{__cc}" %install -rm -rf %{buildroot} -mkdir -p %{buildroot}/etc/sysconfig +%{__rm} -rf %{buildroot} +%{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig -make install DESTDIR=%{buildroot} +%{__make} install DESTDIR=%{buildroot} -install -p -m 0755 contrib/dhcpd-conf-to-ldap.pl %{buildroot}/usr/bin/dhcpd-conf-to-ldap +%{__install} -p -m 0755 contrib/dhcpd-conf-to-ldap.pl %{buildroot}/usr/bin/dhcpd-conf-to-ldap -mkdir -p %{buildroot}/etc/rc.d/init.d -install -p -m 0755 %SOURCE2 %{buildroot}/etc/rc.d/init.d/dhcpd +%{__mkdir} -p %{buildroot}%{_initrddir} +%{__install} -p -m 0755 %SOURCE2 %{buildroot}%{_initrddir}/dhcpd touch %{buildroot}%{_localstatedir}/lib/dhcpd/dhcpd.leases -mkdir -p %{buildroot}%{_localstatedir}/lib/dhclient/ -cat < %{buildroot}/etc/sysconfig/dhcpd +%{__mkdir} -p %{buildroot}%{_localstatedir}/lib/dhclient/ +%{__cat} < %{buildroot}%{_sysconfdir}/sysconfig/dhcpd # Command line options here DHCPDARGS= EOF -install -p -m 0755 %SOURCE3 %{buildroot}/etc/rc.d/init.d/dhcrelay +%{__install} -p -m 0755 %SOURCE3 %{buildroot}%{_initrddir}/dhcrelay -cat < %{buildroot}/etc/sysconfig/dhcrelay +%{__cat} < %{buildroot}%{_sysconfdir}/sysconfig/dhcrelay # Command line options here INTERFACES="" DHCPSERVERS="" EOF # Copy sample dhclient.conf file into position -cp -p client/dhclient.conf dhclient.conf.sample -chmod 755 %{buildroot}/sbin/dhclient-script - -# Create per-package copies of dhcp-options and dhcp-eval common man-pages: -cp -fp %{buildroot}%{_mandir}/man5/dhcp-options.5 %{buildroot}%{_mandir}/man5/dhcpd-options.5 -cp -fp %{buildroot}%{_mandir}/man5/dhcp-options.5 %{buildroot}%{_mandir}/man5/dhclient-options.5 -cp -fp %{buildroot}%{_mandir}/man5/dhcp-eval.5 %{buildroot}%{_mandir}/man5/dhcpd-eval.5 -cp -fp %{buildroot}%{_mandir}/man5/dhcp-eval.5 %{buildroot}%{_mandir}/man5/dhclient-eval.5 +%{__cp} -p client/dhclient.conf dhclient.conf.sample +%{__chmod} 0755 %{buildroot}/sbin/dhclient-script # Install default (empty) dhcpd.conf: -cp -fp %SOURCE4 %{buildroot}/etc +%{__cp} -fp %SOURCE4 %{buildroot}%{_sysconfdir} -install -p -m 0644 -D libdhcp4client.pc %{buildroot}%{_libdir}/pkgconfig/libdhcp4client.pc +%{__install} -p -m 0644 -D libdhcp4client.pc %{buildroot}%{_libdir}/pkgconfig/libdhcp4client.pc # Sources files can't be symlinks for debuginfo package generation find %{workdir} -type l | while read f; do - rm -f linkderef - cp $f linkderef - rm -f $f - mv linkderef $f + %{__rm} -f linkderef + %{__cp} $f linkderef + %{__rm} -f $f + %{__mv} linkderef $f done %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post /sbin/chkconfig --add dhcpd @@ -261,27 +282,25 @@ %files %defattr(-,root,root,-) %doc README README.ldap RELNOTES dhcpd.conf.sample doc/IANA-arp-parameters -%doc doc/IANA-arp-parameters doc/api+protocol doc/*.txt +%doc doc/IANA-arp-parameters doc/api+protocol doc/*.txt contrib %dir %{_localstatedir}/lib/dhcpd %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd.leases -%config(noreplace) /etc/sysconfig/dhcpd -%config(noreplace) /etc/sysconfig/dhcrelay -%config(noreplace) /etc/dhcpd.conf -/etc/rc.d/init.d/dhcpd -/etc/rc.d/init.d/dhcrelay +%config(noreplace) %{_sysconfdir}/sysconfig/dhcpd +%config(noreplace) %{_sysconfdir}/sysconfig/dhcrelay +%config(noreplace) %{_sysconfdir}/dhcpd.conf +%{_initrddir}/dhcpd +%{_initrddir}/dhcrelay %{_bindir}/omshell %{_bindir}/dhcpd-conf-to-ldap %{_sbindir}/dhcpd %{_sbindir}/dhcrelay -%{_mandir}/man1/omshell.1* -%{_mandir}/man5/dhcpd.conf.5* -%{_mandir}/man5/dhcpd.leases.5* -%{_mandir}/man8/dhcpd.8* -%{_mandir}/man8/dhcrelay.8* -%{_mandir}/man5/dhcpd-options.5* -%{_mandir}/man5/dhcpd-eval.5* -%ghost %{_mandir}/man5/dhcp-options.5.gz -%ghost %{_mandir}/man5/dhcp-eval.5.gz +%{_mandir}/man1/omshell.1.gz +%{_mandir}/man5/dhcpd.conf.5.gz +%{_mandir}/man5/dhcpd.leases.5.gz +%{_mandir}/man8/dhcpd.8.gz +%{_mandir}/man8/dhcrelay.8.gz +%{_mandir}/man5/dhcp-options.5.gz +%{_mandir}/man5/dhcp-eval.5.gz %files -n dhclient %defattr(-,root,root,-) @@ -289,14 +308,12 @@ %dir %{_localstatedir}/lib/dhclient /sbin/dhclient /sbin/dhclient-script -%{_mandir}/man5/dhclient.conf.5* -%{_mandir}/man5/dhclient.leases.5* -%{_mandir}/man8/dhclient.8* -%{_mandir}/man8/dhclient-script.8* -%{_mandir}/man5/dhclient-options.5* -%{_mandir}/man5/dhclient-eval.5* -%ghost %{_mandir}/man5/dhcp-options.5.gz -%ghost %{_mandir}/man5/dhcp-eval.5.gz +%{_mandir}/man5/dhclient.conf.5.gz +%{_mandir}/man5/dhclient.leases.5.gz +%{_mandir}/man8/dhclient.8.gz +%{_mandir}/man8/dhclient-script.8.gz +%{_mandir}/man5/dhcp-options.5.gz +%{_mandir}/man5/dhcp-eval.5.gz %files devel %defattr(-,root,root,-) @@ -318,6 +335,19 @@ %{_libdir}/libdhcp4client.so %changelog +* Thu Mar 01 2007 David Cantrell - 12:3.0.5-24 +- Include contrib/ subdirectory in /usr/share/doc (#230476) +- Added back Requires for perl since dhcpd-conf-to-ldap needs it (#225691) +- Put copies of dhcp-options and dhcp-eval man pages in the dhcp and + dhclient packages rather than having the elaborate symlink collection +- Explicitly name man pages in the %%files listings +- Use the %%{_sysconfdir} and %%{_initrddir} macros (#225691) +- Use macros for commands in %%build and %%install +- Split README.ldap, draft-ietf-dhc-ldap-schema-01.txt, and + dhcpd-conf-to-ldap.pl out of the LDAP patch +- Split linux.dbus-example script out of the extended new option info patch +- Remove unnecessary changes from the Makefile patch + * Wed Feb 28 2007 David Cantrell - 12:3.0.5-23 - Update Xen partial checksums patch - Remove perl Requires (#225691) From fedora-cvs-commits at redhat.com Mon Mar 5 16:05:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 11:05:55 -0500 Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.144,1.145 Message-ID: <200703051605.l25G5t90015204@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15139 Modified Files: linux-2.6-compile-fixes.patch Log Message: go with upstream fix linux-2.6-compile-fixes.patch: b/drivers/ata/pata_jmicron.c | 1 - linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c | 4 ++++ linux-2.6.20.noarch/drivers/video/nvidia/nv_backlight.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- linux-2.6-compile-fixes.patch 5 Mar 2007 07:57:44 -0000 1.144 +++ linux-2.6-compile-fixes.patch 5 Mar 2007 16:05:53 -0000 1.145 @@ -61,7 +61,7 @@ #include #include #include -+#ifdef __powerpc__ ++#ifdef CONFIG_PMAC_BACKLIGHT +#include +#endif #include "nv_local.h" From fedora-cvs-commits at redhat.com Mon Mar 5 16:10:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 11:10:42 -0500 Subject: rpms/tcp_wrappers/FC-5 tcp_wrappers.spec,1.19,1.20 Message-ID: <200703051610.l25GAgIq015296@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/tcp_wrappers/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv15278 Modified Files: tcp_wrappers.spec Log Message: Added dist tag. Index: tcp_wrappers.spec =================================================================== RCS file: /cvs/dist/rpms/tcp_wrappers/FC-5/tcp_wrappers.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- tcp_wrappers.spec 11 Feb 2006 05:48:31 -0000 1.19 +++ tcp_wrappers.spec 5 Mar 2007 16:10:35 -0000 1.20 @@ -1,7 +1,7 @@ Summary: A security tool which acts as a wrapper for TCP daemons. Name: tcp_wrappers Version: 7.6 -Release: 40.2 +Release: 40.2%{?dist} %define LIB_MAJOR 0 %define LIB_MINOR 7 From fedora-cvs-commits at redhat.com Mon Mar 5 16:11:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 11:11:31 -0500 Subject: rpms/tcp_wrappers/FC-6 tcp_wrappers.spec,1.20,1.21 Message-ID: <200703051611.l25GBVtJ015346@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/tcp_wrappers/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15332 Modified Files: tcp_wrappers.spec Log Message: Added dist tag. Index: tcp_wrappers.spec =================================================================== RCS file: /cvs/dist/rpms/tcp_wrappers/FC-6/tcp_wrappers.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- tcp_wrappers.spec 12 Jul 2006 08:26:50 -0000 1.20 +++ tcp_wrappers.spec 5 Mar 2007 16:11:26 -0000 1.21 @@ -1,7 +1,7 @@ Summary: A security tool which acts as a wrapper for TCP daemons. Name: tcp_wrappers Version: 7.6 -Release: 40.2.1 +Release: 40.2.1%{?dist} %define LIB_MAJOR 0 %define LIB_MINOR 7 From fedora-cvs-commits at redhat.com Mon Mar 5 17:04:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 12:04:31 -0500 Subject: rpms/tcp_wrappers/devel tcp_wrappers.spec,1.21,1.22 Message-ID: <200703051704.l25H4V9C007160@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/tcp_wrappers/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7110 Modified Files: tcp_wrappers.spec Log Message: * Mon Mar 05 2007 Tomas Janousek - 7.6-42 - added Obsoletes field so that the upgrade goes cleanly - added dist tag Index: tcp_wrappers.spec =================================================================== RCS file: /cvs/dist/rpms/tcp_wrappers/devel/tcp_wrappers.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- tcp_wrappers.spec 4 Dec 2006 13:47:56 -0000 1.21 +++ tcp_wrappers.spec 5 Mar 2007 17:04:29 -0000 1.22 @@ -1,7 +1,7 @@ Summary: A security tool which acts as a wrapper for TCP daemons. Name: tcp_wrappers Version: 7.6 -Release: 41 +Release: 42%{?dist} %define LIB_MAJOR 0 %define LIB_MINOR 7 @@ -31,6 +31,7 @@ BuildRequires: glibc-devel >= 2.2 BuildRoot: %{_tmppath}/%{name}-root Requires: tcp_wrappers-libs = %{version}-%{release} +Obsoletes: tcp_wrappers < 7.6-41 %description The tcp_wrappers package provides small daemon programs which can @@ -45,6 +46,7 @@ %package libs Summary: tcp_wrappers libraries. Group: System Environment/Libraries +Obsoletes: tcp_wrappers < 7.6-41 %description libs tcp_wrappers-libs contains the libraries of the tcp_wrappers package. @@ -52,6 +54,7 @@ %package devel Summary: tcp_wrappers development libraries and headers. Group: Development/Libraries +Obsoletes: tcp_wrappers < 7.6-41 Requires: tcp_wrappers-libs = %{version}-%{release} %description devel @@ -132,6 +135,10 @@ %{_mandir}/man3/* %changelog +* Mon Mar 05 2007 Tomas Janousek - 7.6-42 +- added Obsoletes field so that the upgrade goes cleanly +- added dist tag + * Mon Dec 4 2006 Thomas Woerner 7.6-41 - moved devel libraries, headers and man pages into devel sub package (#193188) - new libs sub package for libraries From fedora-cvs-commits at redhat.com Mon Mar 5 18:15:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 13:15:07 -0500 Subject: rpms/cscope/devel cscope-15.5-fscanf-overflows.patch, 1.1, 1.2 cscope-15.5-ocs-dash_s_fix.patch, 1.1, 1.2 cscope-15.5-resize.patch, 1.4, 1.5 cscope-15.5-tempsec.patch, 1.1, 1.2 cscope.spec, 1.30, 1.31 Message-ID: <200703051815.l25IF7XM012413@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/cscope/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12392 Modified Files: cscope-15.5-fscanf-overflows.patch cscope-15.5-ocs-dash_s_fix.patch cscope-15.5-resize.patch cscope-15.5-tempsec.patch cscope.spec Log Message: Resolves: bz 230862 cscope-15.5-fscanf-overflows.patch: build.c | 10 +++++----- command.c | 2 +- constants.h | 8 ++++++++ dir.c | 2 +- display.c | 2 +- edit.c | 4 ++-- input.c | 17 ++++++++--------- main.c | 17 ++++++++++++----- 8 files changed, 38 insertions(+), 24 deletions(-) Index: cscope-15.5-fscanf-overflows.patch =================================================================== RCS file: /cvs/dist/rpms/cscope/devel/cscope-15.5-fscanf-overflows.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cscope-15.5-fscanf-overflows.patch 23 Aug 2006 15:36:15 -0000 1.1 +++ cscope-15.5-fscanf-overflows.patch 5 Mar 2007 18:15:00 -0000 1.2 @@ -1,6 +1,6 @@ ---- cscope-15.5/src/display.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/display.c 2006-08-23 10:19:41.000000000 -0400 -@@ -217,7 +217,7 @@ +--- cscope-15.5/src/display.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/display.c 2007-03-05 12:02:10.000000000 -0500 +@@ -217,7 +217,7 @@ display(void) disprefs < mdisprefs && screenline <= lastdispline; ++disprefs, ++screenline) { /* read the reference line */ @@ -9,9 +9,80 @@ linenum, tempstring) < 4) { break; } ---- cscope-15.5/src/input.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/input.c 2006-08-23 10:57:01.000000000 -0400 -@@ -293,16 +293,15 @@ +--- cscope-15.5/src/build.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/build.c 2007-03-05 12:02:10.000000000 -0500 +@@ -115,7 +115,7 @@ samelist(FILE *oldrefs, char **names, in + } + /* see if the name list is the same */ + for (i = 0; i < count; ++i) { +- if (fscanf(oldrefs, "%s", oldname) != 1 || ++ if (! fgets(oldname, sizeof(oldname), oldrefs)|| + strnotequal(oldname, names[i])) { + return(NO); + } +@@ -223,8 +223,8 @@ build(void) + /* if there is an old cross-reference and its current directory matches */ + /* or this is an unconditional build */ + if ((oldrefs = vpfopen(reffile, "rb")) != NULL && unconditional == NO && +- fscanf(oldrefs, "cscope %d %s", &fileversion, olddir) == 2 && +- (strcmp(olddir, currentdir) == 0 || /* remain compatible */ ++ fscanf(oldrefs, "cscope %d %" PATHLEN_STR "s", &fileversion, olddir) == 2 ++ && (strcmp(olddir, currentdir) == 0 || /* remain compatible */ + strcmp(olddir, newdir) == 0)) { + /* get the cross-reference file's modification time */ + (void) fstat(fileno(oldrefs), &statstruct); +@@ -292,7 +292,7 @@ build(void) + /* see if the list of source files is the same and + none have been changed up to the included files */ + for (i = 0; i < nsrcfiles; ++i) { +- if (fscanf(oldrefs, "%s", oldname) != 1 || ++ if (! fgets(oldname, sizeof(oldname), oldrefs) || + strnotequal(oldname, srcfiles[i]) || + lstat(srcfiles[i], &statstruct) != 0 || + statstruct.st_mtime > reftime) { +@@ -301,7 +301,7 @@ build(void) + } + /* the old cross-reference is up-to-date */ + /* so get the list of included files */ +- while (i++ < oldnum && fscanf(oldrefs, "%s", oldname) == 1) { ++ while (i++ < oldnum && fgets(oldname, sizeof(oldname), oldrefs)) { + addsrcfile(oldname); + } + (void) fclose(oldrefs); +--- cscope-15.5/src/dir.c.orig 2003-06-02 06:43:00.000000000 -0400 ++++ cscope-15.5/src/dir.c 2007-03-05 12:02:10.000000000 -0500 +@@ -319,7 +319,7 @@ makefilelist(void) + + /* Parse whitespace-terminated strings in line: */ + point_in_line = line; +- while (sscanf(point_in_line, "%s", path) == 1) { ++ while (sscanf(point_in_line, "%" PATHLEN_STR "s", path) == 1) { + /* Have to store this length --- inviewpath() will + * modify path, later! */ + length_of_name = strlen(path); +--- cscope-15.5/src/edit.c.orig 2001-07-18 09:49:01.000000000 -0400 ++++ cscope-15.5/src/edit.c 2007-03-05 12:02:10.000000000 -0500 +@@ -60,7 +60,7 @@ editref(int i) + seekline(i + topline); + + /* get the file name and line number */ +- if (fscanf(refsfound, "%s%*s%s", file, linenum) == 2) { ++ if (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s", file, linenum) == 2) { + edit(file, linenum); /* edit it */ + } + seekline(topline); /* restore the line pointer */ +@@ -83,7 +83,7 @@ editall(void) + seekline(1); + + /* get each file name and line number */ +- while (fscanf(refsfound, "%s%*s%s%*[^\n]", file, linenum) == 2) { ++ while (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", file, linenum) == 2) { + edit(file, linenum); /* edit it */ + if (editallprompt == YES) { + addstr("Type ^D to stop editing all lines, or any other character to continue: "); +--- cscope-15.5/src/input.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/input.c 2007-03-05 12:02:10.000000000 -0500 +@@ -293,16 +293,15 @@ shellpath(char *out, int limit, char *in /* if the login name is null, then use $HOME */ if (*out == '\0') { v = getenv("HOME"); @@ -33,7 +104,7 @@ out += strlen(out); } } -@@ -322,11 +321,11 @@ +@@ -322,11 +321,11 @@ shellpath(char *out, int limit, char *in *s = '\0'; /* get its value */ @@ -48,51 +119,9 @@ out += strlen(out); } } ---- cscope-15.5/src/edit.c.orig 2001-07-18 09:49:01.000000000 -0400 -+++ cscope-15.5/src/edit.c 2006-08-23 10:16:30.000000000 -0400 -@@ -60,7 +60,7 @@ - seekline(i + topline); - - /* get the file name and line number */ -- if (fscanf(refsfound, "%s%*s%s", file, linenum) == 2) { -+ if (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s", file, linenum) == 2) { - edit(file, linenum); /* edit it */ - } - seekline(topline); /* restore the line pointer */ -@@ -83,7 +83,7 @@ - seekline(1); - - /* get each file name and line number */ -- while (fscanf(refsfound, "%s%*s%s%*[^\n]", file, linenum) == 2) { -+ while (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", file, linenum) == 2) { - edit(file, linenum); /* edit it */ - if (editallprompt == YES) { - addstr("Type ^D to stop editing all lines, or any other character to continue: "); ---- cscope-15.5/src/command.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/command.c 2006-08-23 10:08:50.000000000 -0400 -@@ -727,7 +727,7 @@ - (void) fprintf(script, "ed - <<\\!\n"); - *oldfile = '\0'; - seekline(1); -- for (i = 0; fscanf(refsfound, "%s%*s%s%*[^\n]", newfile, linenum) == 2; -+ for (i = 0; fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", newfile, linenum) == 2; - ++i) { - /* see if the line is to be changed */ - if (change[i] == YES) { ---- cscope-15.5/src/dir.c.orig 2003-06-02 06:43:00.000000000 -0400 -+++ cscope-15.5/src/dir.c 2006-08-23 10:09:20.000000000 -0400 -@@ -319,7 +319,7 @@ - - /* Parse whitespace-terminated strings in line: */ - point_in_line = line; -- while (sscanf(point_in_line, "%s", path) == 1) { -+ while (sscanf(point_in_line, "%" PATHLEN_STR "s", path) == 1) { - /* Have to store this length --- inviewpath() will - * modify path, later! */ - length_of_name = strlen(path); ---- cscope-15.5/src/main.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/main.c 2006-08-23 11:26:48.000000000 -0400 -@@ -102,10 +102,10 @@ +--- cscope-15.5/src/main.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/main.c 2007-03-05 12:02:10.000000000 -0500 +@@ -102,10 +102,10 @@ BOOL select_large = NO; /* enable more t #endif char temp1[PATHLEN + 1]; /* temporary file name */ char temp2[PATHLEN + 1]; /* temporary file name */ @@ -105,7 +134,7 @@ * which had better be left alone */ char *tmpdir; /* temporary directory */ -@@ -270,6 +270,13 @@ +@@ -264,6 +264,13 @@ main(int argc, char **argv) s[11] = '\0'; } #endif @@ -119,7 +148,7 @@ s = path + strlen(path); (void) strcpy(s, ".in"); invname = stralloc(path); -@@ -491,11 +498,11 @@ +@@ -491,11 +498,11 @@ lastarg: || (names = vpfopen(NAMEFILE, "r")) != NULL) { /* read any -p option from it */ @@ -133,7 +162,7 @@ s = path; } switch (i) { -@@ -512,7 +519,7 @@ +@@ -512,7 +519,7 @@ lastarg: } else { for (i = 0; i < nsrcfiles; ++i) { @@ -142,8 +171,19 @@ posterr("cscope: cannot read source file name from file %s\n", reffile); myexit(1); } ---- cscope-15.5/src/constants.h.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/constants.h 2006-08-23 10:16:30.000000000 -0400 +--- cscope-15.5/src/command.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/command.c 2007-03-05 12:02:10.000000000 -0500 +@@ -727,7 +727,7 @@ changestring(void) + (void) fprintf(script, "ed - <<\\!\n"); + *oldfile = '\0'; + seekline(1); +- for (i = 0; fscanf(refsfound, "%s%*s%s%*[^\n]", newfile, linenum) == 2; ++ for (i = 0; fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", newfile, linenum) == 2; + ++i) { + /* see if the line is to be changed */ + if (change[i] == YES) { +--- cscope-15.5/src/constants.h.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/constants.h 2007-03-05 12:02:10.000000000 -0500 @@ -68,6 +68,7 @@ #define NUMLEN 5 /* line number length */ #define PATHLEN 250 /* file pathname length */ @@ -166,43 +206,3 @@ /* screen lines */ #define FLDLINE (LINES - FIELDS - 1) /* first input field line */ #define MSGLINE 0 /* message line */ ---- cscope-15.5/src/build.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/build.c 2006-08-23 11:17:57.000000000 -0400 -@@ -115,7 +115,7 @@ - } - /* see if the name list is the same */ - for (i = 0; i < count; ++i) { -- if (fscanf(oldrefs, "%s", oldname) != 1 || -+ if (! fgets(oldname, sizeof(oldname), oldrefs)|| - strnotequal(oldname, names[i])) { - return(NO); - } -@@ -223,8 +223,8 @@ - /* if there is an old cross-reference and its current directory matches */ - /* or this is an unconditional build */ - if ((oldrefs = vpfopen(reffile, "rb")) != NULL && unconditional == NO && -- fscanf(oldrefs, "cscope %d %s", &fileversion, olddir) == 2 && -- (strcmp(olddir, currentdir) == 0 || /* remain compatible */ -+ fscanf(oldrefs, "cscope %d %" PATHLEN_STR "s", &fileversion, olddir) == 2 -+ && (strcmp(olddir, currentdir) == 0 || /* remain compatible */ - strcmp(olddir, newdir) == 0)) { - /* get the cross-reference file's modification time */ - (void) fstat(fileno(oldrefs), &statstruct); -@@ -292,7 +292,7 @@ - /* see if the list of source files is the same and - none have been changed up to the included files */ - for (i = 0; i < nsrcfiles; ++i) { -- if (fscanf(oldrefs, "%s", oldname) != 1 || -+ if (! fgets(oldname, sizeof(oldname), oldrefs) || - strnotequal(oldname, srcfiles[i]) || - lstat(srcfiles[i], &statstruct) != 0 || - statstruct.st_mtime > reftime) { -@@ -301,7 +301,7 @@ - } - /* the old cross-reference is up-to-date */ - /* so get the list of included files */ -- while (i++ < oldnum && fscanf(oldrefs, "%s", oldname) == 1) { -+ while (i++ < oldnum && fgets(oldname, sizeof(oldname), oldrefs)) { - addsrcfile(oldname); - } - (void) fclose(oldrefs); cscope-15.5-ocs-dash_s_fix.patch: ocs | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: cscope-15.5-ocs-dash_s_fix.patch =================================================================== RCS file: /cvs/dist/rpms/cscope/devel/cscope-15.5-ocs-dash_s_fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cscope-15.5-ocs-dash_s_fix.patch 13 Sep 2004 15:47:43 -0000 1.1 +++ cscope-15.5-ocs-dash_s_fix.patch 5 Mar 2007 18:15:00 -0000 1.2 @@ -1,7 +1,6 @@ -diff -Nur cscope-15.5-orig/contrib/ocs cscope-15.5/contrib/ocs ---- cscope-15.5-orig/contrib/ocs 2001-07-18 15:48:56.000000000 +0200 -+++ cscope-15.5/contrib/ocs 2004-07-03 23:08:38.000000000 +0200 -@@ -107,7 +107,7 @@ +--- cscope-15.5/contrib/ocs.orig 2007-03-05 11:57:36.000000000 -0500 ++++ cscope-15.5/contrib/ocs 2007-03-05 11:58:11.000000000 -0500 +@@ -119,7 +119,7 @@ SPECDEST= # hops - query for files # # Parse the command line cscope-15.5-resize.patch: command.c | 20 ++++++++++++++++++++ input.c | 12 ++++++++++-- main.c | 15 ++++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) Index: cscope-15.5-resize.patch =================================================================== RCS file: /cvs/dist/rpms/cscope/devel/cscope-15.5-resize.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cscope-15.5-resize.patch 29 Nov 2004 13:13:53 -0000 1.4 +++ cscope-15.5-resize.patch 5 Mar 2007 18:15:00 -0000 1.5 @@ -1,41 +1,5 @@ ---- cscope-15.5/src/command.c.orig 2004-11-26 21:21:46.523695928 -0500 -+++ cscope-15.5/src/command.c 2004-11-26 21:30:35.322306320 -0500 -@@ -80,6 +80,7 @@ - FILE *file; - struct cmd *curritem, *item; /* command history */ - char *s; -+ int lines, cols; - - switch (commandc) { - -@@ -405,6 +406,25 @@ - entercurses(); - break; - -+ case KEY_RESIZE: -+ exitcurses(); -+ initscr(); -+ entercurses(); -+#if TERMINFO -+ (void) keypad(stdscr, TRUE); /* enable the keypad */ -+#ifdef HAVE_FIXKEYPAD -+ fixkeypad(); /* fix for getch() intermittently returning garbage */ -+#endif -+#endif -+#if UNIXPC -+ standend(); /* turn off reverse video */ -+#endif -+ dispinit(); /* initialize display parameters */ -+ setfield(); /* set the initial cursor position */ -+ postmsg(""); /* clear any build progress message */ -+ display(); /* display the version number and input fields */ -+ break; -+ - case ctrl('L'): /* redraw screen */ - #if TERMINFO - case KEY_CLEAR: --- cscope-15.5/src/input.c.orig 2001-07-18 09:49:01.000000000 -0400 -+++ cscope-15.5/src/input.c 2004-11-26 21:18:09.526684488 -0500 ++++ cscope-15.5/src/input.c 2007-03-05 11:52:23.000000000 -0500 @@ -43,6 +43,7 @@ #endif #include /* jmp_buf */ @@ -44,7 +8,7 @@ #if HAVE_SYS_TERMIOS_H #include #endif -@@ -91,8 +92,15 @@ +@@ -91,8 +92,15 @@ mygetch(void) c = prevchar; prevchar = 0; } @@ -63,7 +27,7 @@ else { /* longjmp to here from signal handler */ c = KEY_BREAK; --- cscope-15.5/src/main.c.orig 2003-08-14 10:36:18.000000000 -0400 -+++ cscope-15.5/src/main.c 2004-11-26 21:27:12.506139064 -0500 ++++ cscope-15.5/src/main.c 2007-03-05 11:53:59.000000000 -0500 @@ -50,6 +50,7 @@ #endif #include /* needed by stat.h */ @@ -72,7 +36,7 @@ /* defaults for unset environment variables */ #define EDITOR "vi" -@@ -120,6 +121,11 @@ +@@ -120,6 +121,11 @@ static void usage(void); void fixkeypad(); #endif @@ -84,7 +48,7 @@ int main(int argc, char **argv) { -@@ -131,12 +137,19 @@ +@@ -131,12 +137,13 @@ main(int argc, char **argv) int c, i; pid_t pid; struct stat stat_buf; @@ -94,13 +58,57 @@ yyout = stdout; /* save the command name for messages */ argv0 = argv[0]; - -+ winch_action.sa_sigaction = sigwinch_handler; -+ sigemptyset(&winch_action.sa_mask); -+ winch_action.sa_flags = SA_SIGINFO; -+ -+ sigaction(SIGWINCH,&winch_action,NULL); +- + /* set the options */ while (--argc > 0 && (*++argv)[0] == '-') { /* HBB 20030814: add GNU-style --help and --version +@@ -364,6 +371,12 @@ lastarg: + + if (linemode == NO) + { ++ ++ winch_action.sa_sigaction = sigwinch_handler; ++ sigemptyset(&winch_action.sa_mask); ++ winch_action.sa_flags = SA_SIGINFO; ++ sigaction(SIGWINCH,&winch_action,NULL); ++ + (void) signal(SIGINT, SIG_IGN); /* ignore interrupts */ + (void) signal(SIGPIPE, SIG_IGN);/* | command can cause pipe signal */ + +--- cscope-15.5/src/command.c.orig 2002-07-29 08:37:49.000000000 -0400 ++++ cscope-15.5/src/command.c 2007-03-05 11:52:23.000000000 -0500 +@@ -80,6 +80,7 @@ command(int commandc) + FILE *file; + struct cmd *curritem, *item; /* command history */ + char *s; ++ int lines, cols; + + switch (commandc) { + +@@ -405,6 +406,25 @@ command(int commandc) + entercurses(); + break; + ++ case KEY_RESIZE: ++ exitcurses(); ++ initscr(); ++ entercurses(); ++#if TERMINFO ++ (void) keypad(stdscr, TRUE); /* enable the keypad */ ++#ifdef HAVE_FIXKEYPAD ++ fixkeypad(); /* fix for getch() intermittently returning garbage */ ++#endif ++#endif ++#if UNIXPC ++ standend(); /* turn off reverse video */ ++#endif ++ dispinit(); /* initialize display parameters */ ++ setfield(); /* set the initial cursor position */ ++ postmsg(""); /* clear any build progress message */ ++ display(); /* display the version number and input fields */ ++ break; ++ + case ctrl('L'): /* redraw screen */ + #if TERMINFO + case KEY_CLEAR: cscope-15.5-tempsec.patch: main.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) Index: cscope-15.5-tempsec.patch =================================================================== RCS file: /cvs/dist/rpms/cscope/devel/cscope-15.5-tempsec.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cscope-15.5-tempsec.patch 30 Nov 2004 21:52:48 -0000 1.1 +++ cscope-15.5-tempsec.patch 5 Mar 2007 18:15:00 -0000 1.2 @@ -1,6 +1,6 @@ ---- cscope-15.5/src/main.c.orig 2004-11-30 10:47:56.000000000 -0500 -+++ cscope-15.5/src/main.c 2004-11-30 12:58:13.000000000 -0500 -@@ -102,6 +102,7 @@ +--- cscope-15.5/src/main.c.orig 2007-03-05 11:59:08.000000000 -0500 ++++ cscope-15.5/src/main.c 2007-03-05 11:59:33.000000000 -0500 +@@ -102,6 +102,7 @@ BOOL select_large = NO; /* enable more t #endif char temp1[PATHLEN + 1]; /* temporary file name */ char temp2[PATHLEN + 1]; /* temporary file name */ @@ -8,7 +8,7 @@ long totalterms; /* total inverted index terms */ BOOL trun_syms; /* truncate symbols to 8 characters */ char tempstring[8192]; /* use this as a buffer, instead of 'yytext', -@@ -138,6 +139,7 @@ +@@ -138,6 +139,7 @@ main(int argc, char **argv) pid_t pid; struct stat stat_buf; struct sigaction winch_action; @@ -16,7 +16,7 @@ yyin = stdin; yyout = stdout; -@@ -344,9 +346,18 @@ +@@ -337,9 +339,18 @@ lastarg: } /* create the temporary file names */ @@ -37,7 +37,7 @@ /* if running in the foreground */ if (signal(SIGINT, SIG_IGN) != SIG_IGN) { -@@ -848,6 +859,7 @@ +@@ -847,6 +858,7 @@ myexit(int sig) if (temp1[0] != '\0') { (void) unlink(temp1); (void) unlink(temp2); Index: cscope.spec =================================================================== RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- cscope.spec 5 Feb 2007 20:05:22 -0000 1.30 +++ cscope.spec 5 Mar 2007 18:15:00 -0000 1.31 @@ -1,7 +1,7 @@ Summary: C source code tree search and browse tool Name: cscope Version: 15.5 -Release: 15.3%{?dist} +Release: 15.4%{?dist} Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz URL: http://cscope.sourceforge.net License: BSD @@ -93,6 +93,9 @@ rm -f %{emacs_lisp_path}/xcscope.el %changelog +* Mon Mar 05 2007 Neil Horman -15.5-15.4.dist +- Make sigwinch handler only register for curses mode (bz 230862) + * Mon Feb 05 2007 Neil Horman -15.5-15.3.dist - Fixing dist label in release tag. From fedora-cvs-commits at redhat.com Mon Mar 5 18:19:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 13:19:44 -0500 Subject: rpms/dhcp/devel dhcp.spec,1.145,1.146 Message-ID: <200703051819.l25IJian005652@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5638 Modified Files: dhcp.spec Log Message: * Mon Mar 05 2007 David Cantrell - 12:3.0.5-25 - Man pages need 0644 permissions (#222572) Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- dhcp.spec 5 Mar 2007 16:02:22 -0000 1.145 +++ dhcp.spec 5 Mar 2007 18:19:42 -0000 1.146 @@ -10,7 +10,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Name: dhcp Version: 3.0.5 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 12 License: ISC Group: System Environment/Daemons @@ -294,13 +294,13 @@ %{_bindir}/dhcpd-conf-to-ldap %{_sbindir}/dhcpd %{_sbindir}/dhcrelay -%{_mandir}/man1/omshell.1.gz -%{_mandir}/man5/dhcpd.conf.5.gz -%{_mandir}/man5/dhcpd.leases.5.gz -%{_mandir}/man8/dhcpd.8.gz -%{_mandir}/man8/dhcrelay.8.gz -%{_mandir}/man5/dhcp-options.5.gz -%{_mandir}/man5/dhcp-eval.5.gz +%attr(0644,root,root) %{_mandir}/man1/omshell.1.gz +%attr(0644,root,root) %{_mandir}/man5/dhcpd.conf.5.gz +%attr(0644,root,root) %{_mandir}/man5/dhcpd.leases.5.gz +%attr(0644,root,root) %{_mandir}/man8/dhcpd.8.gz +%attr(0644,root,root) %{_mandir}/man8/dhcrelay.8.gz +%attr(0644,root,root) %{_mandir}/man5/dhcp-options.5.gz +%attr(0644,root,root) %{_mandir}/man5/dhcp-eval.5.gz %files -n dhclient %defattr(-,root,root,-) @@ -308,12 +308,12 @@ %dir %{_localstatedir}/lib/dhclient /sbin/dhclient /sbin/dhclient-script -%{_mandir}/man5/dhclient.conf.5.gz -%{_mandir}/man5/dhclient.leases.5.gz -%{_mandir}/man8/dhclient.8.gz -%{_mandir}/man8/dhclient-script.8.gz -%{_mandir}/man5/dhcp-options.5.gz -%{_mandir}/man5/dhcp-eval.5.gz +%attr(0644,root,root) %{_mandir}/man5/dhclient.conf.5.gz +%attr(0644,root,root) %{_mandir}/man5/dhclient.leases.5.gz +%attr(0644,root,root) %{_mandir}/man8/dhclient.8.gz +%attr(0644,root,root) %{_mandir}/man8/dhclient-script.8.gz +%attr(0644,root,root) %{_mandir}/man5/dhcp-options.5.gz +%attr(0644,root,root) %{_mandir}/man5/dhcp-eval.5.gz %files devel %defattr(-,root,root,-) @@ -335,6 +335,9 @@ %{_libdir}/libdhcp4client.so %changelog +* Mon Mar 05 2007 David Cantrell - 12:3.0.5-25 +- Man pages need 0644 permissions (#222572) + * Thu Mar 01 2007 David Cantrell - 12:3.0.5-24 - Include contrib/ subdirectory in /usr/share/doc (#230476) - Added back Requires for perl since dhcpd-conf-to-ldap needs it (#225691) From fedora-cvs-commits at redhat.com Mon Mar 5 18:25:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 13:25:29 -0500 Subject: rpms/cscope/FC-6 cscope-15.5-fscanf-overflows.patch, 1.1, 1.2 cscope-15.5-ocs-dash_s_fix.patch, 1.1, 1.2 cscope-15.5-resize.patch, 1.4, 1.5 cscope-15.5-tempsec.patch, 1.1, 1.2 cscope.spec, 1.28, 1.29 Message-ID: <200703051825.l25IPT1x005783@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/cscope/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5766 Modified Files: cscope-15.5-fscanf-overflows.patch cscope-15.5-ocs-dash_s_fix.patch cscope-15.5-resize.patch cscope-15.5-tempsec.patch cscope.spec Log Message: Resolves bz 230862 cscope-15.5-fscanf-overflows.patch: build.c | 10 +++++----- command.c | 2 +- constants.h | 8 ++++++++ dir.c | 2 +- display.c | 2 +- edit.c | 4 ++-- input.c | 17 ++++++++--------- main.c | 17 ++++++++++++----- 8 files changed, 38 insertions(+), 24 deletions(-) Index: cscope-15.5-fscanf-overflows.patch =================================================================== RCS file: /cvs/dist/rpms/cscope/FC-6/cscope-15.5-fscanf-overflows.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cscope-15.5-fscanf-overflows.patch 23 Aug 2006 15:36:15 -0000 1.1 +++ cscope-15.5-fscanf-overflows.patch 5 Mar 2007 18:25:27 -0000 1.2 @@ -1,6 +1,6 @@ ---- cscope-15.5/src/display.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/display.c 2006-08-23 10:19:41.000000000 -0400 -@@ -217,7 +217,7 @@ +--- cscope-15.5/src/display.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/display.c 2007-03-05 12:02:10.000000000 -0500 +@@ -217,7 +217,7 @@ display(void) disprefs < mdisprefs && screenline <= lastdispline; ++disprefs, ++screenline) { /* read the reference line */ @@ -9,9 +9,80 @@ linenum, tempstring) < 4) { break; } ---- cscope-15.5/src/input.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/input.c 2006-08-23 10:57:01.000000000 -0400 -@@ -293,16 +293,15 @@ +--- cscope-15.5/src/build.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/build.c 2007-03-05 12:02:10.000000000 -0500 +@@ -115,7 +115,7 @@ samelist(FILE *oldrefs, char **names, in + } + /* see if the name list is the same */ + for (i = 0; i < count; ++i) { +- if (fscanf(oldrefs, "%s", oldname) != 1 || ++ if (! fgets(oldname, sizeof(oldname), oldrefs)|| + strnotequal(oldname, names[i])) { + return(NO); + } +@@ -223,8 +223,8 @@ build(void) + /* if there is an old cross-reference and its current directory matches */ + /* or this is an unconditional build */ + if ((oldrefs = vpfopen(reffile, "rb")) != NULL && unconditional == NO && +- fscanf(oldrefs, "cscope %d %s", &fileversion, olddir) == 2 && +- (strcmp(olddir, currentdir) == 0 || /* remain compatible */ ++ fscanf(oldrefs, "cscope %d %" PATHLEN_STR "s", &fileversion, olddir) == 2 ++ && (strcmp(olddir, currentdir) == 0 || /* remain compatible */ + strcmp(olddir, newdir) == 0)) { + /* get the cross-reference file's modification time */ + (void) fstat(fileno(oldrefs), &statstruct); +@@ -292,7 +292,7 @@ build(void) + /* see if the list of source files is the same and + none have been changed up to the included files */ + for (i = 0; i < nsrcfiles; ++i) { +- if (fscanf(oldrefs, "%s", oldname) != 1 || ++ if (! fgets(oldname, sizeof(oldname), oldrefs) || + strnotequal(oldname, srcfiles[i]) || + lstat(srcfiles[i], &statstruct) != 0 || + statstruct.st_mtime > reftime) { +@@ -301,7 +301,7 @@ build(void) + } + /* the old cross-reference is up-to-date */ + /* so get the list of included files */ +- while (i++ < oldnum && fscanf(oldrefs, "%s", oldname) == 1) { ++ while (i++ < oldnum && fgets(oldname, sizeof(oldname), oldrefs)) { + addsrcfile(oldname); + } + (void) fclose(oldrefs); +--- cscope-15.5/src/dir.c.orig 2003-06-02 06:43:00.000000000 -0400 ++++ cscope-15.5/src/dir.c 2007-03-05 12:02:10.000000000 -0500 +@@ -319,7 +319,7 @@ makefilelist(void) + + /* Parse whitespace-terminated strings in line: */ + point_in_line = line; +- while (sscanf(point_in_line, "%s", path) == 1) { ++ while (sscanf(point_in_line, "%" PATHLEN_STR "s", path) == 1) { + /* Have to store this length --- inviewpath() will + * modify path, later! */ + length_of_name = strlen(path); +--- cscope-15.5/src/edit.c.orig 2001-07-18 09:49:01.000000000 -0400 ++++ cscope-15.5/src/edit.c 2007-03-05 12:02:10.000000000 -0500 +@@ -60,7 +60,7 @@ editref(int i) + seekline(i + topline); + + /* get the file name and line number */ +- if (fscanf(refsfound, "%s%*s%s", file, linenum) == 2) { ++ if (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s", file, linenum) == 2) { + edit(file, linenum); /* edit it */ + } + seekline(topline); /* restore the line pointer */ +@@ -83,7 +83,7 @@ editall(void) + seekline(1); + + /* get each file name and line number */ +- while (fscanf(refsfound, "%s%*s%s%*[^\n]", file, linenum) == 2) { ++ while (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", file, linenum) == 2) { + edit(file, linenum); /* edit it */ + if (editallprompt == YES) { + addstr("Type ^D to stop editing all lines, or any other character to continue: "); +--- cscope-15.5/src/input.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/input.c 2007-03-05 12:02:10.000000000 -0500 +@@ -293,16 +293,15 @@ shellpath(char *out, int limit, char *in /* if the login name is null, then use $HOME */ if (*out == '\0') { v = getenv("HOME"); @@ -33,7 +104,7 @@ out += strlen(out); } } -@@ -322,11 +321,11 @@ +@@ -322,11 +321,11 @@ shellpath(char *out, int limit, char *in *s = '\0'; /* get its value */ @@ -48,51 +119,9 @@ out += strlen(out); } } ---- cscope-15.5/src/edit.c.orig 2001-07-18 09:49:01.000000000 -0400 -+++ cscope-15.5/src/edit.c 2006-08-23 10:16:30.000000000 -0400 -@@ -60,7 +60,7 @@ - seekline(i + topline); - - /* get the file name and line number */ -- if (fscanf(refsfound, "%s%*s%s", file, linenum) == 2) { -+ if (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s", file, linenum) == 2) { - edit(file, linenum); /* edit it */ - } - seekline(topline); /* restore the line pointer */ -@@ -83,7 +83,7 @@ - seekline(1); - - /* get each file name and line number */ -- while (fscanf(refsfound, "%s%*s%s%*[^\n]", file, linenum) == 2) { -+ while (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", file, linenum) == 2) { - edit(file, linenum); /* edit it */ - if (editallprompt == YES) { - addstr("Type ^D to stop editing all lines, or any other character to continue: "); ---- cscope-15.5/src/command.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/command.c 2006-08-23 10:08:50.000000000 -0400 -@@ -727,7 +727,7 @@ - (void) fprintf(script, "ed - <<\\!\n"); - *oldfile = '\0'; - seekline(1); -- for (i = 0; fscanf(refsfound, "%s%*s%s%*[^\n]", newfile, linenum) == 2; -+ for (i = 0; fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", newfile, linenum) == 2; - ++i) { - /* see if the line is to be changed */ - if (change[i] == YES) { ---- cscope-15.5/src/dir.c.orig 2003-06-02 06:43:00.000000000 -0400 -+++ cscope-15.5/src/dir.c 2006-08-23 10:09:20.000000000 -0400 -@@ -319,7 +319,7 @@ - - /* Parse whitespace-terminated strings in line: */ - point_in_line = line; -- while (sscanf(point_in_line, "%s", path) == 1) { -+ while (sscanf(point_in_line, "%" PATHLEN_STR "s", path) == 1) { - /* Have to store this length --- inviewpath() will - * modify path, later! */ - length_of_name = strlen(path); ---- cscope-15.5/src/main.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/main.c 2006-08-23 11:26:48.000000000 -0400 -@@ -102,10 +102,10 @@ +--- cscope-15.5/src/main.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/main.c 2007-03-05 12:02:10.000000000 -0500 +@@ -102,10 +102,10 @@ BOOL select_large = NO; /* enable more t #endif char temp1[PATHLEN + 1]; /* temporary file name */ char temp2[PATHLEN + 1]; /* temporary file name */ @@ -105,7 +134,7 @@ * which had better be left alone */ char *tmpdir; /* temporary directory */ -@@ -270,6 +270,13 @@ +@@ -264,6 +264,13 @@ main(int argc, char **argv) s[11] = '\0'; } #endif @@ -119,7 +148,7 @@ s = path + strlen(path); (void) strcpy(s, ".in"); invname = stralloc(path); -@@ -491,11 +498,11 @@ +@@ -491,11 +498,11 @@ lastarg: || (names = vpfopen(NAMEFILE, "r")) != NULL) { /* read any -p option from it */ @@ -133,7 +162,7 @@ s = path; } switch (i) { -@@ -512,7 +519,7 @@ +@@ -512,7 +519,7 @@ lastarg: } else { for (i = 0; i < nsrcfiles; ++i) { @@ -142,8 +171,19 @@ posterr("cscope: cannot read source file name from file %s\n", reffile); myexit(1); } ---- cscope-15.5/src/constants.h.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/constants.h 2006-08-23 10:16:30.000000000 -0400 +--- cscope-15.5/src/command.c.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/command.c 2007-03-05 12:02:10.000000000 -0500 +@@ -727,7 +727,7 @@ changestring(void) + (void) fprintf(script, "ed - <<\\!\n"); + *oldfile = '\0'; + seekline(1); +- for (i = 0; fscanf(refsfound, "%s%*s%s%*[^\n]", newfile, linenum) == 2; ++ for (i = 0; fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", newfile, linenum) == 2; + ++i) { + /* see if the line is to be changed */ + if (change[i] == YES) { +--- cscope-15.5/src/constants.h.orig 2007-03-05 12:01:59.000000000 -0500 ++++ cscope-15.5/src/constants.h 2007-03-05 12:02:10.000000000 -0500 @@ -68,6 +68,7 @@ #define NUMLEN 5 /* line number length */ #define PATHLEN 250 /* file pathname length */ @@ -166,43 +206,3 @@ /* screen lines */ #define FLDLINE (LINES - FIELDS - 1) /* first input field line */ #define MSGLINE 0 /* message line */ ---- cscope-15.5/src/build.c.orig 2006-08-23 07:08:40.000000000 -0400 -+++ cscope-15.5/src/build.c 2006-08-23 11:17:57.000000000 -0400 -@@ -115,7 +115,7 @@ - } - /* see if the name list is the same */ - for (i = 0; i < count; ++i) { -- if (fscanf(oldrefs, "%s", oldname) != 1 || -+ if (! fgets(oldname, sizeof(oldname), oldrefs)|| - strnotequal(oldname, names[i])) { - return(NO); - } -@@ -223,8 +223,8 @@ - /* if there is an old cross-reference and its current directory matches */ - /* or this is an unconditional build */ - if ((oldrefs = vpfopen(reffile, "rb")) != NULL && unconditional == NO && -- fscanf(oldrefs, "cscope %d %s", &fileversion, olddir) == 2 && -- (strcmp(olddir, currentdir) == 0 || /* remain compatible */ -+ fscanf(oldrefs, "cscope %d %" PATHLEN_STR "s", &fileversion, olddir) == 2 -+ && (strcmp(olddir, currentdir) == 0 || /* remain compatible */ - strcmp(olddir, newdir) == 0)) { - /* get the cross-reference file's modification time */ - (void) fstat(fileno(oldrefs), &statstruct); -@@ -292,7 +292,7 @@ - /* see if the list of source files is the same and - none have been changed up to the included files */ - for (i = 0; i < nsrcfiles; ++i) { -- if (fscanf(oldrefs, "%s", oldname) != 1 || -+ if (! fgets(oldname, sizeof(oldname), oldrefs) || - strnotequal(oldname, srcfiles[i]) || - lstat(srcfiles[i], &statstruct) != 0 || - statstruct.st_mtime > reftime) { -@@ -301,7 +301,7 @@ - } - /* the old cross-reference is up-to-date */ - /* so get the list of included files */ -- while (i++ < oldnum && fscanf(oldrefs, "%s", oldname) == 1) { -+ while (i++ < oldnum && fgets(oldname, sizeof(oldname), oldrefs)) { - addsrcfile(oldname); - } - (void) fclose(oldrefs); cscope-15.5-ocs-dash_s_fix.patch: ocs | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: cscope-15.5-ocs-dash_s_fix.patch =================================================================== RCS file: /cvs/dist/rpms/cscope/FC-6/cscope-15.5-ocs-dash_s_fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cscope-15.5-ocs-dash_s_fix.patch 13 Sep 2004 15:47:43 -0000 1.1 +++ cscope-15.5-ocs-dash_s_fix.patch 5 Mar 2007 18:25:27 -0000 1.2 @@ -1,7 +1,6 @@ -diff -Nur cscope-15.5-orig/contrib/ocs cscope-15.5/contrib/ocs ---- cscope-15.5-orig/contrib/ocs 2001-07-18 15:48:56.000000000 +0200 -+++ cscope-15.5/contrib/ocs 2004-07-03 23:08:38.000000000 +0200 -@@ -107,7 +107,7 @@ +--- cscope-15.5/contrib/ocs.orig 2007-03-05 11:57:36.000000000 -0500 ++++ cscope-15.5/contrib/ocs 2007-03-05 11:58:11.000000000 -0500 +@@ -119,7 +119,7 @@ SPECDEST= # hops - query for files # # Parse the command line cscope-15.5-resize.patch: command.c | 20 ++++++++++++++++++++ input.c | 12 ++++++++++-- main.c | 15 ++++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) Index: cscope-15.5-resize.patch =================================================================== RCS file: /cvs/dist/rpms/cscope/FC-6/cscope-15.5-resize.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cscope-15.5-resize.patch 29 Nov 2004 13:13:53 -0000 1.4 +++ cscope-15.5-resize.patch 5 Mar 2007 18:25:27 -0000 1.5 @@ -1,41 +1,5 @@ ---- cscope-15.5/src/command.c.orig 2004-11-26 21:21:46.523695928 -0500 -+++ cscope-15.5/src/command.c 2004-11-26 21:30:35.322306320 -0500 -@@ -80,6 +80,7 @@ - FILE *file; - struct cmd *curritem, *item; /* command history */ - char *s; -+ int lines, cols; - - switch (commandc) { - -@@ -405,6 +406,25 @@ - entercurses(); - break; - -+ case KEY_RESIZE: -+ exitcurses(); -+ initscr(); -+ entercurses(); -+#if TERMINFO -+ (void) keypad(stdscr, TRUE); /* enable the keypad */ -+#ifdef HAVE_FIXKEYPAD -+ fixkeypad(); /* fix for getch() intermittently returning garbage */ -+#endif -+#endif -+#if UNIXPC -+ standend(); /* turn off reverse video */ -+#endif -+ dispinit(); /* initialize display parameters */ -+ setfield(); /* set the initial cursor position */ -+ postmsg(""); /* clear any build progress message */ -+ display(); /* display the version number and input fields */ -+ break; -+ - case ctrl('L'): /* redraw screen */ - #if TERMINFO - case KEY_CLEAR: --- cscope-15.5/src/input.c.orig 2001-07-18 09:49:01.000000000 -0400 -+++ cscope-15.5/src/input.c 2004-11-26 21:18:09.526684488 -0500 ++++ cscope-15.5/src/input.c 2007-03-05 11:52:23.000000000 -0500 @@ -43,6 +43,7 @@ #endif #include /* jmp_buf */ @@ -44,7 +8,7 @@ #if HAVE_SYS_TERMIOS_H #include #endif -@@ -91,8 +92,15 @@ +@@ -91,8 +92,15 @@ mygetch(void) c = prevchar; prevchar = 0; } @@ -63,7 +27,7 @@ else { /* longjmp to here from signal handler */ c = KEY_BREAK; --- cscope-15.5/src/main.c.orig 2003-08-14 10:36:18.000000000 -0400 -+++ cscope-15.5/src/main.c 2004-11-26 21:27:12.506139064 -0500 ++++ cscope-15.5/src/main.c 2007-03-05 11:53:59.000000000 -0500 @@ -50,6 +50,7 @@ #endif #include /* needed by stat.h */ @@ -72,7 +36,7 @@ /* defaults for unset environment variables */ #define EDITOR "vi" -@@ -120,6 +121,11 @@ +@@ -120,6 +121,11 @@ static void usage(void); void fixkeypad(); #endif @@ -84,7 +48,7 @@ int main(int argc, char **argv) { -@@ -131,12 +137,19 @@ +@@ -131,12 +137,13 @@ main(int argc, char **argv) int c, i; pid_t pid; struct stat stat_buf; @@ -94,13 +58,57 @@ yyout = stdout; /* save the command name for messages */ argv0 = argv[0]; - -+ winch_action.sa_sigaction = sigwinch_handler; -+ sigemptyset(&winch_action.sa_mask); -+ winch_action.sa_flags = SA_SIGINFO; -+ -+ sigaction(SIGWINCH,&winch_action,NULL); +- + /* set the options */ while (--argc > 0 && (*++argv)[0] == '-') { /* HBB 20030814: add GNU-style --help and --version +@@ -364,6 +371,12 @@ lastarg: + + if (linemode == NO) + { ++ ++ winch_action.sa_sigaction = sigwinch_handler; ++ sigemptyset(&winch_action.sa_mask); ++ winch_action.sa_flags = SA_SIGINFO; ++ sigaction(SIGWINCH,&winch_action,NULL); ++ + (void) signal(SIGINT, SIG_IGN); /* ignore interrupts */ + (void) signal(SIGPIPE, SIG_IGN);/* | command can cause pipe signal */ + +--- cscope-15.5/src/command.c.orig 2002-07-29 08:37:49.000000000 -0400 ++++ cscope-15.5/src/command.c 2007-03-05 11:52:23.000000000 -0500 +@@ -80,6 +80,7 @@ command(int commandc) + FILE *file; + struct cmd *curritem, *item; /* command history */ + char *s; ++ int lines, cols; + + switch (commandc) { + +@@ -405,6 +406,25 @@ command(int commandc) + entercurses(); + break; + ++ case KEY_RESIZE: ++ exitcurses(); ++ initscr(); ++ entercurses(); ++#if TERMINFO ++ (void) keypad(stdscr, TRUE); /* enable the keypad */ ++#ifdef HAVE_FIXKEYPAD ++ fixkeypad(); /* fix for getch() intermittently returning garbage */ ++#endif ++#endif ++#if UNIXPC ++ standend(); /* turn off reverse video */ ++#endif ++ dispinit(); /* initialize display parameters */ ++ setfield(); /* set the initial cursor position */ ++ postmsg(""); /* clear any build progress message */ ++ display(); /* display the version number and input fields */ ++ break; ++ + case ctrl('L'): /* redraw screen */ + #if TERMINFO + case KEY_CLEAR: cscope-15.5-tempsec.patch: main.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) Index: cscope-15.5-tempsec.patch =================================================================== RCS file: /cvs/dist/rpms/cscope/FC-6/cscope-15.5-tempsec.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cscope-15.5-tempsec.patch 30 Nov 2004 21:52:48 -0000 1.1 +++ cscope-15.5-tempsec.patch 5 Mar 2007 18:25:27 -0000 1.2 @@ -1,6 +1,6 @@ ---- cscope-15.5/src/main.c.orig 2004-11-30 10:47:56.000000000 -0500 -+++ cscope-15.5/src/main.c 2004-11-30 12:58:13.000000000 -0500 -@@ -102,6 +102,7 @@ +--- cscope-15.5/src/main.c.orig 2007-03-05 11:59:08.000000000 -0500 ++++ cscope-15.5/src/main.c 2007-03-05 11:59:33.000000000 -0500 +@@ -102,6 +102,7 @@ BOOL select_large = NO; /* enable more t #endif char temp1[PATHLEN + 1]; /* temporary file name */ char temp2[PATHLEN + 1]; /* temporary file name */ @@ -8,7 +8,7 @@ long totalterms; /* total inverted index terms */ BOOL trun_syms; /* truncate symbols to 8 characters */ char tempstring[8192]; /* use this as a buffer, instead of 'yytext', -@@ -138,6 +139,7 @@ +@@ -138,6 +139,7 @@ main(int argc, char **argv) pid_t pid; struct stat stat_buf; struct sigaction winch_action; @@ -16,7 +16,7 @@ yyin = stdin; yyout = stdout; -@@ -344,9 +346,18 @@ +@@ -337,9 +339,18 @@ lastarg: } /* create the temporary file names */ @@ -37,7 +37,7 @@ /* if running in the foreground */ if (signal(SIGINT, SIG_IGN) != SIG_IGN) { -@@ -848,6 +859,7 @@ +@@ -847,6 +858,7 @@ myexit(int sig) if (temp1[0] != '\0') { (void) unlink(temp1); (void) unlink(temp2); Index: cscope.spec =================================================================== RCS file: /cvs/dist/rpms/cscope/FC-6/cscope.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- cscope.spec 23 Aug 2006 15:36:15 -0000 1.28 +++ cscope.spec 5 Mar 2007 18:25:27 -0000 1.29 @@ -1,7 +1,7 @@ Summary: C source code tree search and browse tool Name: cscope Version: 15.5 -Release: 15%{dist}.1 +Release: 15.4%{?dist} Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz URL: http://cscope.sourceforge.net License: BSD @@ -93,9 +93,18 @@ rm -f %{emacs_lisp_path}/xcscope.el %changelog -* Wed Aug 23 2006 Neil Horman -15.5-15%{dist}.1 +* Mon Mar 05 2007 Neil Horman -15.5-15.4.dist +- Make sigwinch handler only register for curses mode (bz 230862) + +* Mon Feb 05 2007 Neil Horman -15.5-15.3.dist +- Fixing dist label in release tag. + +* Thu Feb 01 2007 Neil Horman -15.5-15.2.dist +- Fixing changelog to not have macro in release + +* Wed Aug 23 2006 Neil Horman -15.5-15.1 - fixed overflows per bz 203651 -- start using %{dist} tag to make release numbering easier +- start using {dist} tag to make release numbering easier * Mon Jul 17 2006 Jesse Keating - 15.5-14 - rebuild From fedora-cvs-commits at redhat.com Mon Mar 5 18:28:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 13:28:01 -0500 Subject: rpms/glib-java/devel glib-java.spec,1.50,1.51 Message-ID: <200703051828.l25IS1pt005939@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/glib-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5925 Modified Files: glib-java.spec Log Message: - Touch aclocal.m4, configure, Makefile.in after applying the patch. Index: glib-java.spec =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- glib-java.spec 2 Mar 2007 14:20:09 -0000 1.50 +++ glib-java.spec 5 Mar 2007 18:27:58 -0000 1.51 @@ -15,7 +15,7 @@ Summary: Base Library for the Java-GNOME libraries Name: %{java_pkg_prefix}%{name_base} Version: 0.2.6 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://java-gnome.sourceforge.net Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2 Patch0: %{name}-gjavah.patch @@ -49,6 +49,8 @@ %setup -q -n %{name_base}-%{version} %patch0 -p0 +touch aclocal.m4 +touch configure Makefile.in %build # if either the C or Java packages has a prefix declared, then we will @@ -119,6 +121,9 @@ %{_datadir}/java/*.zip %changelog +* Mon Mar 5 2007 Stepan Kasal - 0.2.6-8 +- Touch aclocal.m4, configure, Makefile.in after applying the patch. + * Fri Mar 2 2007 Stepan Kasal - 0.2.6-7 - Force -fPIC and avoid -Wall with gcj/ecj. From fedora-cvs-commits at redhat.com Mon Mar 5 18:41:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 13:41:52 -0500 Subject: rpms/cairo-java/devel cairo-java.spec,1.43,1.44 Message-ID: <200703051841.l25IfqBx026912@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/cairo-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26803 Modified Files: cairo-java.spec Log Message: - Touch aclocal.m4, configure, Makefile.in after applying the patch. - Force -fPIC and avoid -Wall with gcj/ecj. Index: cairo-java.spec =================================================================== RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- cairo-java.spec 21 Feb 2007 16:57:01 -0000 1.43 +++ cairo-java.spec 5 Mar 2007 18:41:50 -0000 1.44 @@ -15,7 +15,7 @@ Summary: Java bindings for the Cairo library Name: %{java_pkg_prefix}%{name_base} Version: 1.0.5 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: Development/Libraries URL: http://java-gnome.sourceforge.net @@ -52,6 +52,8 @@ %setup -q -n %{name_base}-%{version} %patch0 -p0 +touch aclocal.m4 +touch configure Makefile.in %build # if either the C or Java packages has a prefix declared, then we will @@ -60,7 +62,12 @@ export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig fi -%configure +# Two workarounds: +# 1) libtool.m4 calls gcj with $CFLAGS and gcj seems to choke on -Wall. +# 2) libtool does not use pic_flag when compiling, so we have to force it. +RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wall /} +%configure CFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="-O2 -fPIC" + make %{?_smp_mflags} # pack up the java source @@ -114,6 +121,10 @@ %changelog +* Mon Mar 5 2007 Stepan Kasal - 1.0.5-6 +- Touch aclocal.m4, configure, Makefile.in after applying the patch. +- Force -fPIC and avoid -Wall with gcj/ecj. + * Wed Feb 21 2007 Andrew Overholt 1.0.5-5 - Bump for new gcj. - Add patch for gcjh -> gjavah. From fedora-cvs-commits at redhat.com Mon Mar 5 18:47:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 13:47:16 -0500 Subject: rpms/libgtk-java/devel libgtk-java.spec,1.72,1.73 Message-ID: <200703051847.l25IlGTx030812@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/libgtk-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30774 Modified Files: libgtk-java.spec Log Message: - Touch aclocal.m4, configure, Makefile.in after applying patch1. - Force -fPIC and avoid -Wall with gcj/ecj. Index: libgtk-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- libgtk-java.spec 21 Feb 2007 17:00:47 -0000 1.72 +++ libgtk-java.spec 5 Mar 2007 18:47:14 -0000 1.73 @@ -18,7 +18,7 @@ Summary: Java bindings for GTK+ Name: %{java_pkg_prefix}%{name_base} Version: 2.8.7 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: Development/Libraries URL: http://java-gnome.sourceforge.net @@ -56,6 +56,8 @@ %setup -q -n %{name_base}-%{version} %patch0 %patch1 +touch aclocal.m4 +touch configure Makefile.in %build # if either the C or Java packages has a prefix declared, then we will @@ -64,7 +66,11 @@ export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig fi -%configure +# Two workarounds: +# 1) libtool.m4 calls gcj with $CFLAGS and gcj seems to choke on -Wall. +# 2) libtool does not use pic_flag when compiling, so we have to force it. +RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wall /} +%configure CFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="-O2 -fPIC" make %{?_smp_mflags} @@ -125,6 +131,10 @@ %changelog +* Mon Mar 5 2007 Stepan Kasal - 2.8.7-4 +- Touch aclocal.m4, configure, Makefile.in after applying patch1. +- Force -fPIC and avoid -Wall with gcj/ecj. + * Wed Feb 21 2007 Andrew Overholt 2.8.7-3 - Rebuild for new gcj. - Add patch for gcjh -> gjavah. From fedora-cvs-commits at redhat.com Mon Mar 5 18:54:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 13:54:00 -0500 Subject: rpms/dhcdbd/devel .cvsignore, 1.24, 1.25 dhcdbd.spec, 1.40, 1.41 sources, 1.34, 1.35 Message-ID: <200703051854.l25Is0tU028907@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcdbd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28867 Modified Files: .cvsignore dhcdbd.spec sources Log Message: * Mon Mar 05 2007 David Cantrell - 2.6-1 - Spec file cleanups to conform to Fedora packaging guidelines - Run 'chkconfig --del dhcdbd' on package removal (#222514) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dhcdbd/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 8 Feb 2007 15:39:03 -0000 1.24 +++ .cvsignore 5 Mar 2007 18:53:54 -0000 1.25 @@ -1 +1 @@ -dhcdbd-2.5.tar.bz2 +dhcdbd-2.6.tar.bz2 Index: dhcdbd.spec =================================================================== RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- dhcdbd.spec 8 Feb 2007 15:39:03 -0000 1.40 +++ dhcdbd.spec 5 Mar 2007 18:53:54 -0000 1.41 @@ -4,9 +4,9 @@ # then currently it MUST be installed setuid; else, it must have an # initscript and be run as root during boot . -Summary: DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options +Summary: DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS Name: dhcdbd -Version: 2.5 +Version: 2.6 Release: 1%{?dist} License: GPL Group: System Environment/Daemons @@ -26,40 +26,46 @@ %setup -q %build -make +%{__make} %{?_smp_mflags} %install -DESTDIR=$RPM_BUILD_ROOT make install -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -install -c -m 755 dhcdbd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd +%{__make} install DESTDIR=%{buildroot} +%{__mkdir} -p %{buildroot}%{_initrddir} +%{__install} -p -c -m 0755 dhcdbd.init %{buildroot}%{_initrddir}/dhcdbd + +%clean +%{__rm} -rf %{buildroot} %post -if [ $1 -eq 1 ]; then - chkconfig --add dhcdbd >/dev/null 2>&1; -fi +/sbin/chkconfig --add dhcdbd +exit 0 %preun if [ $1 -eq 0 ]; then service dhcdbd stop >/dev/null 2>&1 + /sbin/chkconfig --del dhcdbd fi +exit 0 %postun if [ $1 -ge 1 ]; then service dhcdbd condrestart >/dev/null 2>&1 fi - -%clean -rm -rf $RPM_BUILD_ROOT +exit 0 %files -%defattr(0644, root, root, 0755) -%config /usr/share/dbus-1/services/dhcdbd.service -%config /etc/dbus-1/system.d/dhcdbd.conf -%attr(755,root,root) /sbin/dhcdbd -%attr(755,root,root) /etc/rc.d/init.d/dhcdbd +%defattr(-, root, root, -) %doc README COPYING ChangeLog TODO +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/dhcdbd.conf +%{_datadir}/dbus-1/services/dhcdbd.service +%attr(755,root,root) /sbin/dhcdbd +%attr(755,root,root) %{_initrddir}/dhcdbd %changelog +* Mon Mar 05 2007 David Cantrell - 2.6-1 +- Spec file cleanups to conform to Fedora packaging guidelines +- Run 'chkconfig --del dhcdbd' on package removal (#222514) + * Thu Feb 08 2007 David Cantrell - 2.5-1 - Remove period from end of summary line (package review) - Use preferred BuildRoot (package review) Index: sources =================================================================== RCS file: /cvs/dist/rpms/dhcdbd/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 8 Feb 2007 15:39:03 -0000 1.34 +++ sources 5 Mar 2007 18:53:54 -0000 1.35 @@ -1 +1 @@ -193df249e1dd579292e42f873b6194e0 dhcdbd-2.5.tar.bz2 +e8242676e71787ec6b7e800d28cb9a3f dhcdbd-2.6.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 5 18:57:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 13:57:04 -0500 Subject: rpms/dhcdbd/FC-6 dhcdbd.spec,1.37,1.38 Message-ID: <200703051857.l25Iv4dd031387@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcdbd/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31335 Modified Files: dhcdbd.spec Log Message: * Mon Mar 05 2007 David Cantrell - 2.1-2 - Run 'chkconfig --del dhcdbd' on package removal (#222514) Index: dhcdbd.spec =================================================================== RCS file: /cvs/dist/rpms/dhcdbd/FC-6/dhcdbd.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- dhcdbd.spec 29 Sep 2006 19:23:20 -0000 1.37 +++ dhcdbd.spec 5 Mar 2007 18:57:02 -0000 1.38 @@ -7,7 +7,7 @@ Summary: DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options. Name: dhcdbd Version: 2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2 @@ -41,6 +41,7 @@ %preun if [ $1 -eq 0 ]; then service dhcdbd stop >/dev/null 2>&1 + /sbin/chkconfig --del dhcdbd fi %postun @@ -60,6 +61,9 @@ %doc README COPYING ChangeLog TODO %changelog +* Mon Mar 05 2007 David Cantrell - 2.1-2 +- Run 'chkconfig --del dhcdbd' on package removal (#222514) + * Fri Sep 29 2006 David Cantrell - 2.1-1 - Line continuation slashes for the description in dhcdbd.init (#204711) From fedora-cvs-commits at redhat.com Mon Mar 5 18:58:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 13:58:11 -0500 Subject: rpms/dhcdbd/FC-5 dhcdbd.spec,1.30,1.31 Message-ID: <200703051858.l25IwBX0032313@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcdbd/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv32266 Modified Files: dhcdbd.spec Log Message: * Mon Mar 05 2007 David Cantrell - 1.15-2.FC5 - Run 'chkconfig --del dhcdbd' on package removal (#222514) - Update Source URL Index: dhcdbd.spec =================================================================== RCS file: /cvs/dist/rpms/dhcdbd/FC-5/dhcdbd.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- dhcdbd.spec 30 May 2006 21:28:02 -0000 1.30 +++ dhcdbd.spec 5 Mar 2007 18:58:09 -0000 1.31 @@ -10,10 +10,10 @@ Summary: DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options. Name: dhcdbd Version: 1.15 -Release: 1.FC5 +Release: 2.FC5 License: GPL Group: System Environment/Daemons -URL: http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz +URL: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz Source1: dhcdbd.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -69,6 +69,7 @@ %preun if [ $1 -eq 0 ]; then service dhcdbd stop; + chkconfig --del dhcdbd >/dev/null 2>&1; fi %postun @@ -92,6 +93,10 @@ %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h %changelog +* Mon Mar 05 2007 David Cantrell - 1.15-2.FC5 +- Run 'chkconfig --del dhcdbd' on package removal (#222514) +- Update Source URL + * Mon May 30 2006 Jason Vas Dias - 1.15-1.FC6 - fix bug 193562: remove 'servicedir' entry from dhcdbd.conf From fedora-cvs-commits at redhat.com Mon Mar 5 19:07:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 14:07:02 -0500 Subject: rpms/libgnome-java/devel libgnome-java-gjavah.patch, NONE, 1.1 libgnome-java.spec, 1.46, 1.47 Message-ID: <200703051907.l25J72bl006483@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/libgnome-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6445 Modified Files: libgnome-java.spec Added Files: libgnome-java-gjavah.patch Log Message: - Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in after applying it. - Force -fPIC and avoid -Wall with gcj/ecj. libgnome-java-gjavah.patch: configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE libgnome-java-gjavah.patch --- --- ./configure.orig 2006-08-03 06:34:18.000000000 +0200 +++ ./configure 2007-03-05 20:00:16.686278000 +0100 @@ -22210,7 +22210,7 @@ -for ac_prog in "gcjh -jni" "javah" +for ac_prog in "gjavah -jni" "javah" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -22249,7 +22249,7 @@ test -n "$JAVAH" && break done -test -n "$JAVAH" || JAVAH="gcjh -jni" +test -n "$JAVAH" || JAVAH="gjavah -jni" ac_config_files="$ac_config_files Makefile" --- ./configure.ac.orig 2006-08-03 05:22:35.000000000 +0200 +++ ./configure.ac 2007-03-05 20:00:24.901056000 +0100 @@ -54,7 +54,7 @@ AC_SUBST(GNOME_CFLAGS) AC_SUBST(GNOME_LIBS) -AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni]) +AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([gnome2-java.pc]) Index: libgnome-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- libgnome-java.spec 21 Feb 2007 16:08:43 -0000 1.46 +++ libgnome-java.spec 5 Mar 2007 19:07:00 -0000 1.47 @@ -15,13 +15,15 @@ Summary: Java bindings for libgnome Name: %{java_pkg_prefix}%{name_base} Version: 2.12.4 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: Development/Libraries URL: http://java-gnome.sourceforge.net Source: http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root +Patch: %{name}-gjavah.patch + Requires: libgnomeui >= 2.11.0 Requires: libgnomecanvas >= 2.11.0 Requires: libgtk-java >= 2.8.6 @@ -51,6 +53,9 @@ %prep %setup -q -n %{name_base}-%{version} +%patch +touch aclocal.m4 +touch configure Makefile.in %build # if either the C or Java packages has a prefix declared, then we will @@ -59,7 +64,12 @@ export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig fi -%configure +# Two workarounds: +# 1) libtool.m4 calls gcj with $CFLAGS and gcj seems to choke on -Wall. +# 2) libtool does not use pic_flag when compiling, so we have to force it. +RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wall /} +%configure CFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="-O2 -fPIC" + make %{?_smp_mflags} # pack up the java source @@ -112,6 +122,11 @@ %{_datadir}/java/*.zip %changelog +* Mon Mar 5 2007 Stepan Kasal - 2.12.4-6 +- Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in + after applying it. +- Force -fPIC and avoid -Wall with gcj/ecj. + * Wed Feb 21 2007 Andrew Overholt 2.12.4-5 - Rebuild for new gcj. From fedora-cvs-commits at redhat.com Mon Mar 5 19:16:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 14:16:56 -0500 Subject: rpms/libglade-java/devel libglade-java-javah.patch, NONE, 1.1 libglade-java.spec, 1.48, 1.49 Message-ID: <200703051916.l25JGutM014082@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/libglade-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14034 Modified Files: libglade-java.spec Added Files: libglade-java-javah.patch Log Message: - Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in after applying it. - Force -fPIC and avoid -Wall with gcj/ecj. libglade-java-javah.patch: configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE libglade-java-javah.patch --- --- ./configure.ac.orig 2006-08-03 05:24:06.000000000 +0200 +++ ./configure.ac 2007-03-05 20:14:24.724384000 +0100 @@ -87,7 +87,7 @@ AC_SUBST(LIBGLADE_CFLAGS) AC_SUBST(LIBGLADE_LIBS) -AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni]) +AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([glade-java.pc]) --- ./configure.orig 2006-08-03 06:41:47.000000000 +0200 +++ ./configure 2007-03-05 20:14:10.064063000 +0100 @@ -22852,7 +22852,7 @@ -for ac_prog in "gcjh -jni" "javah" +for ac_prog in "gjavah -jni" "javah" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -22891,7 +22891,7 @@ test -n "$JAVAH" && break done -test -n "$JAVAH" || JAVAH="gcjh -jni" +test -n "$JAVAH" || JAVAH="gjavah -jni" ac_config_files="$ac_config_files Makefile" Index: libglade-java.spec =================================================================== RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- libglade-java.spec 21 Feb 2007 16:08:05 -0000 1.48 +++ libglade-java.spec 5 Mar 2007 19:16:49 -0000 1.49 @@ -15,13 +15,15 @@ Summary: Java bindings for libglade Name: %{java_pkg_prefix}%{name_base} Version: 2.12.5 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: Development/Libraries URL: http://java-gnome.sourceforge.net Source: http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root +Patch: %{name}-gjavah.patch + Requires: libglade2 >= 2.5.1 Requires: %{java_pkg_prefix}libgtk-java >= 2.8.6 Requires: %{java_pkg_prefix}libgnome-java >= 2.12.4 @@ -47,6 +49,9 @@ %prep %setup -q -n %{name_base}-%{version} +%patch +touch aclocal.m4 +touch configure Makefile.in %build # if either the C or Java packages has a prefix declared, then we will @@ -55,7 +60,11 @@ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/lib/pkgconfig fi -%configure %{configure_args} +# Two workarounds: +# 1) libtool.m4 calls gcj with $CFLAGS and gcj seems to choke on -Wall. +# 2) libtool does not use pic_flag when compiling, so we have to force it. +RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wall /} +%configure CFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="-O2 -fPIC" mkdir -p doc/api/ make %{?_smp_mflags} @@ -109,6 +118,11 @@ %{_datadir}/java/*.zip %changelog +* Mon Mar 5 2007 Stepan Kasal - 2.12.5-6 +- Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in + after applying it. +- Force -fPIC and avoid -Wall with gcj/ecj. + * Wed Feb 21 2007 Andrew Overholt 2.12.5-5 - Rebuild for new gcj. From fedora-cvs-commits at redhat.com Mon Mar 5 19:34:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 14:34:12 -0500 Subject: rpms/kernel/devel patch-2.6.21-rc2-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.579, 1.580 kernel-2.6.spec, 1.2963, 1.2964 linux-2.6-compile-fixes.patch, 1.145, 1.146 sources, 1.542, 1.543 upstream, 1.471, 1.472 patch-2.6.21-rc2-git3.bz2.sign, 1.1, NONE Message-ID: <200703051934.l25JYCdQ020099@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19711 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch sources upstream Added Files: patch-2.6.21-rc2-git4.bz2.sign Removed Files: patch-2.6.21-rc2-git3.bz2.sign Log Message: * Mon Mar 05 2007 Dave Jones - 2.6.21rc2-git4 --- NEW FILE patch-2.6.21-rc2-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF68aJyGugalF9Dw4RAnbNAKCGkK2lkseqHZCNcqNHgjMcW2MdtQCdF8LL cSFA8WpxsFsfi1syMqco+6E= =Oy+l -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.579 retrieving revision 1.580 diff -u -r1.579 -r1.580 --- .cvsignore 5 Mar 2007 07:22:29 -0000 1.579 +++ .cvsignore 5 Mar 2007 19:34:10 -0000 1.580 @@ -4,4 +4,4 @@ kernel-2.6.20 linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git3.bz2 +patch-2.6.21-rc2-git4.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2963 retrieving revision 1.2964 diff -u -r1.2963 -r1.2964 --- kernel-2.6.spec 5 Mar 2007 07:22:29 -0000 1.2963 +++ kernel-2.6.spec 5 Mar 2007 19:34:10 -0000 1.2964 @@ -295,7 +295,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.21-rc2.bz2 -Patch2: patch-2.6.21-rc2-git3.bz2 +Patch2: patch-2.6.21-rc2-git4.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -2037,6 +2037,9 @@ %changelog * Mon Mar 05 2007 Dave Jones +- 2.6.21rc2-git4 + +* Mon Mar 05 2007 Dave Jones - 2.6.21rc2-git3 * Fri Mar 02 2007 Dave Jones linux-2.6-compile-fixes.patch: linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c | 4 ++++ linux-2.6.20.noarch/drivers/video/nvidia/nv_backlight.c | 3 +++ 2 files changed, 7 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.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- linux-2.6-compile-fixes.patch 5 Mar 2007 16:05:53 -0000 1.145 +++ linux-2.6-compile-fixes.patch 5 Mar 2007 19:34:10 -0000 1.146 @@ -6,22 +6,6 @@ # -#drivers/net/smc-ultra.c: In function 'ultra_block_input': -#drivers/net/smc-ultra.c:458: error: implicit declaration of function 'eth_io_copy_and_sum' -# -#Signed-off-by: Dave Jones -# -#--- linux-2.6.19.noarch/include/asm-powerpc/io.h~ 2006-12-29 02:11:33.000000000 -0500 -#+++ linux-2.6.19.noarch/include/asm-powerpc/io.h 2006-12-29 02:12:30.000000000 -0500 -#@@ -729,6 +729,7 @@ static inline void * bus_to_virt(unsigne -# } -# -# #define page_to_bus(page) (page_to_phys(page) + PCI_DRAM_OFFSET) -#+#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d)) -# -# #endif /* CONFIG_PPC32 */ -# - --- linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c~ 2006-11-29 21:57:37.000000000 +0000 +++ linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c 2006-12-13 16:53:11.000000000 +0000 @@ -43,9 +43,11 @@ void __spin_yield(raw_spinlock_t *lock) @@ -67,23 +51,3 @@ #include "nv_local.h" #include "nv_type.h" #include "nv_proto.h" -commit 527e1e1879cb10958b7ad4e04b3877abf54df3bd -Author: Jeff Garzik -Date: Sat Mar 3 10:36:19 2007 -0500 - - [libata] pata_jmicron: build fix - - Signed-off-by: Jeff Garzik - -diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c -index 033319e..43763c9 100644 ---- a/drivers/ata/pata_jmicron.c -+++ b/drivers/ata/pata_jmicron.c -@@ -244,7 +244,6 @@ static void __exit jmicron_exit(void) - { - pci_unregister_driver(&jmicron_pci_driver); - } --#endif - - module_init(jmicron_init); - module_exit(jmicron_exit); Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.542 retrieving revision 1.543 diff -u -r1.542 -r1.543 --- sources 5 Mar 2007 07:22:29 -0000 1.542 +++ sources 5 Mar 2007 19:34:10 -0000 1.543 @@ -1,3 +1,3 @@ 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 e31c877d30a840c590c06e53779246f4 patch-2.6.21-rc2.bz2 -0b119fcef1ed2d4e6c3a7a84f4be9902 patch-2.6.21-rc2-git3.bz2 +d6d255472d2fd1fbb45658c02d8802f3 patch-2.6.21-rc2-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.471 retrieving revision 1.472 diff -u -r1.471 -r1.472 --- upstream 5 Mar 2007 07:22:29 -0000 1.471 +++ upstream 5 Mar 2007 19:34:10 -0000 1.472 @@ -1,3 +1,3 @@ linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git3.bz2 +patch-2.6.21-rc2-git4.bz2 --- patch-2.6.21-rc2-git3.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 5 19:35:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 14:35:07 -0500 Subject: rpms/libgconf-java/devel libgconf-java-javah.patch, NONE, 1.1 libgconf-java.spec, 1.41, 1.42 Message-ID: <200703051935.l25JZ7bt020557@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/libgconf-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20541 Modified Files: libgconf-java.spec Added Files: libgconf-java-javah.patch Log Message: - Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in after applying it. - Force -fPIC and avoid -Wall with gcj/ecj. libgconf-java-javah.patch: configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE libgconf-java-javah.patch --- --- ./configure.ac.orig 2006-08-03 04:58:13.000000000 +0200 +++ ./configure.ac 2007-03-05 20:31:37.959117000 +0100 @@ -55,7 +55,7 @@ AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) -AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni]) +AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([gconf-java.pc]) --- ./configure.orig 2006-08-03 08:52:30.000000000 +0200 +++ ./configure 2007-03-05 20:31:31.442642000 +0100 @@ -22210,7 +22210,7 @@ -for ac_prog in "gcjh -jni" "javah" +for ac_prog in "gjavah -jni" "javah" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -22249,7 +22249,7 @@ test -n "$JAVAH" && break done -test -n "$JAVAH" || JAVAH="gcjh -jni" +test -n "$JAVAH" || JAVAH="gjavah -jni" ac_config_files="$ac_config_files Makefile" Index: libgconf-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- libgconf-java.spec 21 Feb 2007 16:06:24 -0000 1.41 +++ libgconf-java.spec 5 Mar 2007 19:35:05 -0000 1.42 @@ -3,13 +3,15 @@ Summary: Java bindings for GConf Name: %{name_base} Version: 2.12.4 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL Group: Development/Libraries URL: http://java-gnome.sourceforge.net Source: http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root +Patch: %{name}-gjavah.patch + Requires: GConf2 >= 2.11.2 Requires: glib-java >= 0.2.6 BuildRequires: glib-java-devel >= 0.2.6 @@ -38,9 +40,17 @@ %prep %setup -q -n %{name_base}-%{version} +%patch +touch aclocal.m4 +touch configure Makefile.in %build -%configure +# Two workarounds: +# 1) libtool.m4 calls gcj with $CFLAGS and gcj seems to choke on -Wall. +# 2) libtool does not use pic_flag when compiling, so we have to force it. +RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wall /} +%configure CFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="-O2 -fPIC" + make %{?_smp_mflags} # pack up the java source @@ -95,6 +105,11 @@ %{_datadir}/java/*.zip %changelog +* Mon Mar 5 2007 Stepan Kasal - 2.12.4-7 +- Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in + after applying it. +- Force -fPIC and avoid -Wall with gcj/ecj. + * Wed Feb 21 2007 Andrew Overholt 2.12.4-6 - Rebuild for new gcj. From fedora-cvs-commits at redhat.com Mon Mar 5 19:39:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 14:39:21 -0500 Subject: rpms/libvte-java/devel libvte-java-javah.patch, NONE, 1.1 libvte-java.spec, 1.29, 1.30 Message-ID: <200703051939.l25JdLsp016750@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/libvte-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16734 Modified Files: libvte-java.spec Added Files: libvte-java-javah.patch Log Message: - Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in after applying it. - Force -fPIC and avoid -Wall with gcj/ecj. libvte-java-javah.patch: configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE libvte-java-javah.patch --- --- ./configure.orig 2006-08-03 16:51:18.000000000 +0200 +++ ./configure 2007-03-05 20:35:59.366449000 +0100 @@ -22021,7 +22021,7 @@ -for ac_prog in "gcjh -jni" "javah" +for ac_prog in "gjavah -jni" "javah" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -22060,7 +22060,7 @@ test -n "$JAVAH" && break done -test -n "$JAVAH" || JAVAH="gcjh -jni" +test -n "$JAVAH" || JAVAH="gjavah -jni" ac_config_files="$ac_config_files Makefile" --- ./configure.ac.orig 2006-08-03 16:51:00.000000000 +0200 +++ ./configure.ac 2007-03-05 20:36:05.603202000 +0100 @@ -54,7 +54,7 @@ AC_SUBST(VTE_CFLAGS) AC_SUBST(VTE_LIBS) -AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni]) +AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([vte-java.pc]) Index: libvte-java.spec =================================================================== RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- libvte-java.spec 21 Feb 2007 16:09:45 -0000 1.29 +++ libvte-java.spec 5 Mar 2007 19:39:19 -0000 1.30 @@ -1,7 +1,7 @@ Summary: Wrapper library for GNOME VTE Name: libvte-java Version: 0.12.1 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://java-gnome.sourceforge.net Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2 License: LGPL @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/libvte-java Patch: libvte-java-alias.patch +Patch1: libvte-java-javah.patch Requires: glib-java >= 0.2.4 Requires: libgtk-java >= 2.8.4 @@ -37,13 +38,16 @@ %setup -q -n %{name}-%{version} %patch +%patch1 +touch aclocal.m4 +touch configure Makefile.in %build -%configure - -# FIXME: find a better solution for this -sed -i 's/^pic_flag=\"\"/pic_flag=\"\ \-fPIC\"/' libtool -sed -i 's/^compiler_c_o=\"no\"/compiler_c_o=\"yes\"/' libtool +# Two workarounds: +# 1) libtool.m4 calls gcj with $CFLAGS and gcj seems to choke on -Wall. +# 2) libtool does not use pic_flag when compiling, so we have to force it. +RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wall /} +%configure CFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="-O2 -fPIC" make %{?_smp_mflags} @@ -99,6 +103,11 @@ %{_datadir}/java/*.zip %changelog +* Mon Mar 5 2007 Stepan Kasal - 0.12.1-7 +- Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in + after applying it. +- Force -fPIC and avoid -Wall with gcj/ecj. + * Wed Feb 21 2007 Andrew Overholt 0.12.1-6 - Rebuild for new gcj. From fedora-cvs-commits at redhat.com Mon Mar 5 20:20:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 15:20:11 -0500 Subject: rpms/zsh/devel zsh.spec,1.32,1.33 Message-ID: <200703052020.l25KKBh0004197@cvs.devel.redhat.com> Author: jantill Update of /cvs/dist/rpms/zsh/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4183 Modified Files: zsh.spec Log Message: * Mon Mar 5 2007 James Antill - 4.2.6-6 - Move requires to be scriptlet specific - chmod functions, to shut rpmlint up (false positive warning) - sed only the requied functions (again, shuts rpmlint up) - Remove zsh-4.0.6-make-test-fail.patch - Remove RPM_SOURCE_DIR var, using %{SOURCEx} and basename Resolves: rhbz#226813 Index: zsh.spec =================================================================== RCS file: /cvs/dist/rpms/zsh/devel/zsh.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- zsh.spec 28 Feb 2007 03:46:10 -0000 1.32 +++ zsh.spec 5 Mar 2007 20:20:09 -0000 1.33 @@ -3,7 +3,7 @@ Summary: A powerful interactive shell Name: zsh Version: 4.2.6 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD URL: http://zsh.sunsite.dk/ Group: System Environment/Shells @@ -16,12 +16,14 @@ Source6: dotzshrc Source7: zshprompt.pl Patch0: zsh-serial.patch -Patch1: zsh-4.0.6-make-test-fail.patch +#Patch1: zsh-4.0.6-make-test-fail.patch #Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch Prereq: fileutils grep /sbin/install-info Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Requires: mktemp coreutils grep info -BuildRequires: ncurses-devel libcap-devel texinfo tetex texi2html +BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel texinfo tetex texi2html +Requires(post): /sbin/install-info grep +Requires(preun): /sbin/install-info +Requires(postun): mktemp coreutils grep %description The zsh shell is a command interpreter usable as an interactive login @@ -84,15 +86,22 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir} -for i in zshrc zlogin zlogout zshenv zprofile; do - install -m 644 $RPM_SOURCE_DIR/${i}.rhs ${RPM_BUILD_ROOT}%{_sysconfdir}/$i +for i in %{SOURCE4} %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE3}; do + install -m 644 $i ${RPM_BUILD_ROOT}%{_sysconfdir}/"$(basename $i .rhs)" done mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/skel install -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/skel/.zshrc -sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \ - ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/* +# This is just here to shut up rpmlint, and is very annoying. +# Note that we can't chmod everything as then rpmlint will complain about +# those without a she-bang line. +for i in checkmail harden run-help zcalc zkbd; do + sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \ + ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/$i + chmod +x ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/$i +done + %clean rm -rf $RPM_BUILD_ROOT @@ -142,11 +151,19 @@ %doc Doc/zsh/*.html %changelog +* Mon Mar 5 2007 James Antill - 4.2.6-6 +- Move requires to be scriptlet specific +- chmod functions, to shut rpmlint up (false positive warning) +- sed only the requied functions (again, shuts rpmlint up) +- Remove zsh-4.0.6-make-test-fail.patch +- Remove RPM_SOURCE_DIR var, using %%{SOURCEx} and basename +Resolves: rhbz#226813 + * Tue Feb 27 2007 James Antill - 4.2.6-5 - Fix sed typo. - Fix skel expansion problem. - Add Requires for mktemp/info/etc. -- Use cp again due to SELinux context. +- Use cp again due to SELinux context Resolves: rhbz#226813 * Tue Feb 27 2007 James Antill - 4.2.6-4 From fedora-cvs-commits at redhat.com Mon Mar 5 20:29:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 15:29:49 -0500 Subject: rpms/emacs/devel .cvsignore, 1.17, 1.18 emacs.spec, 1.91, 1.92 sources, 1.18, 1.19 loaddefs-dependencies.patch, 1.1, NONE Message-ID: <200703052029.l25KTnXC004440@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4424 Modified Files: .cvsignore emacs.spec sources Removed Files: loaddefs-dependencies.patch Log Message: new pretest tarball obsoletes loaddefs.el dependencies patch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 23 Jan 2007 21:40:31 -0000 1.17 +++ .cvsignore 5 Mar 2007 20:29:47 -0000 1.18 @@ -1,13 +1,2 @@ -Mule-UCS-current.tar.gz -elisp-manual-21-2.8.tar.bz2 -emacs-21.3 -emacs-21.3.tar.gz -leim-21.3.tar.gz +emacs-22.0.94.tar.gz php-mode-1.1.0.tgz -tramp-2.1.3.tar.gz -emacs-21.4.tar.gz -leim-21.4.tar.gz -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: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- emacs.spec 26 Feb 2007 16:40:12 -0000 1.91 +++ emacs.spec 5 Mar 2007 20:29:47 -0000 1.92 @@ -2,8 +2,8 @@ Summary: GNU Emacs text editor Name: emacs -Version: 22.0.93 -Release: 7%{?dist} +Version: 22.0.94 +Release: 1%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -38,7 +38,6 @@ Conflicts: gettext < 0.10.40 # C and build patches -Patch0: loaddefs-dependencies.patch # Lisp and doc patches @@ -95,9 +94,6 @@ %prep %setup -q -%patch0 -p1 - -autoconf # install rest of site-lisp files ( cd site-lisp @@ -291,6 +287,9 @@ %dir %{_datadir}/emacs/%{version} %changelog +* Mon Feb 26 2007 Chip Coldwell - 22.0.94-1 +- new pretest tarball obsoletes loaddefs.el dependencies patch + * Fri Feb 23 2007 Chip Coldwell - 22.0.93-7 - fix po-mode-init.el (Kjartan Maraas #228143) Index: sources =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 23 Jan 2007 21:40:31 -0000 1.18 +++ sources 5 Mar 2007 20:29:47 -0000 1.19 @@ -1,2 +1,2 @@ +1bcf94dcce09279f32c05acbd0b98eca emacs-22.0.94.tar.gz aad009f7cff4019aac9a466ec9b55aaf php-mode-1.1.0.tgz -4e768a1489e514fbb78d1a5f9c512846 emacs-22.0.93.tar.gz --- loaddefs-dependencies.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 5 20:39:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 15:39:54 -0500 Subject: rpms/libdhcp/devel .cvsignore, 1.20, 1.21 libdhcp.spec, 1.46, 1.47 sources, 1.32, 1.33 Message-ID: <200703052039.l25KdsEX024217@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/libdhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24172 Modified Files: .cvsignore libdhcp.spec sources Log Message: * Mon Mar 05 2007 David Cantrell - 1.22-1 - Remove unused variables from nic.c Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 16 Feb 2007 16:08:59 -0000 1.20 +++ .cvsignore 5 Mar 2007 20:39:52 -0000 1.21 @@ -1 +1 @@ -libdhcp-1.20.tar.bz2 +libdhcp-1.22.tar.bz2 Index: libdhcp.spec =================================================================== RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- libdhcp.spec 16 Feb 2007 21:39:43 -0000 1.46 +++ libdhcp.spec 5 Mar 2007 20:39:52 -0000 1.47 @@ -1,7 +1,7 @@ Summary: A library for network interface configuration with DHCP Name: libdhcp -Version: 1.20 -Release: 2%{?dist} +Version: 1.22 +Release: 1%{?dist} License: GPL Group: Development/Libraries URL: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2 @@ -33,14 +33,13 @@ %setup -q %build -rm -rf $RPM_BUILD_ROOT -CFLAGS="$RPM_OPT_FLAGS $CFLAGS" CC=%{__cc} make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -%makeinstall pkgcfgdir=${RPM_BUILD_ROOT}%{_libdir}/pkgconfig +%{__make} install DESTDIR=%{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %post -p /sbin/ldconfig @@ -53,13 +52,20 @@ %files devel %defattr(-,root,root,-) +%doc examples/ %{_libdir}/libdhcp.so %{_libdir}/libdhcp.a %{_includedir}/libdhcp %{_libdir}/pkgconfig/libdhcp.pc -%doc examples/ %changelog +* Mon Mar 05 2007 David Cantrell - 1.22-1 +- Remove unused variables from nic.c + +* Mon Mar 05 2007 David Cantrell - 1.21-1 +- Spec file cleanups for Fedora packaging guidelines +- Lose some of the NIC_DEBUG noise (#199481) + * Fri Feb 16 2007 David Cantrell - 1.20-2 - Rebuild for new libdhcp6client Index: sources =================================================================== RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 16 Feb 2007 16:08:59 -0000 1.32 +++ sources 5 Mar 2007 20:39:52 -0000 1.33 @@ -1 +1 @@ -02376447afa1130ff2427dfead1a2daf libdhcp-1.20.tar.bz2 +a8e4cf1026f0b794c691f235f6d6063c libdhcp-1.22.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 5 20:53:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 15:53:52 -0500 Subject: rpms/libdhcp/devel .cvsignore, 1.21, 1.22 libdhcp.spec, 1.47, 1.48 sources, 1.33, 1.34 Message-ID: <200703052053.l25Krq2B027598@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/libdhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27555 Modified Files: .cvsignore libdhcp.spec sources Log Message: * Mon Mar 05 2007 David Cantrell - 1.23-1 - Pass %{_libdir} in %install Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 5 Mar 2007 20:39:52 -0000 1.21 +++ .cvsignore 5 Mar 2007 20:53:50 -0000 1.22 @@ -1 +1 @@ -libdhcp-1.22.tar.bz2 +libdhcp-1.23.tar.bz2 Index: libdhcp.spec =================================================================== RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- libdhcp.spec 5 Mar 2007 20:39:52 -0000 1.47 +++ libdhcp.spec 5 Mar 2007 20:53:50 -0000 1.48 @@ -1,6 +1,6 @@ Summary: A library for network interface configuration with DHCP Name: libdhcp -Version: 1.22 +Version: 1.23 Release: 1%{?dist} License: GPL Group: Development/Libraries @@ -36,7 +36,7 @@ %{__make} %{?_smp_mflags} %install -%{__make} install DESTDIR=%{buildroot} +%{__make} install DESTDIR=%{buildroot} libdir=%{buildroot}%{_libdir} %clean %{__rm} -rf %{buildroot} @@ -59,6 +59,9 @@ %{_libdir}/pkgconfig/libdhcp.pc %changelog +* Mon Mar 05 2007 David Cantrell - 1.23-1 +- Pass %%{_libdir} in %%install + * Mon Mar 05 2007 David Cantrell - 1.22-1 - Remove unused variables from nic.c Index: sources =================================================================== RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 5 Mar 2007 20:39:52 -0000 1.33 +++ sources 5 Mar 2007 20:53:50 -0000 1.34 @@ -1 +1 @@ -a8e4cf1026f0b794c691f235f6d6063c libdhcp-1.22.tar.bz2 +78b1fd39d5168d2ce6190298425d67b8 libdhcp-1.23.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 5 21:52:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 16:52:06 -0500 Subject: rpms/perl-Archive-Tar/devel perl-Archive-Tar.spec,1.22,1.23 Message-ID: <200703052152.l25Lq6Jd007843@cvs.devel.redhat.com> Author: rnorwood Update of /cvs/dist/rpms/perl-Archive-Tar/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7829 Modified Files: perl-Archive-Tar.spec Log Message: fix changelog. Index: perl-Archive-Tar.spec =================================================================== RCS file: /cvs/dist/rpms/perl-Archive-Tar/devel/perl-Archive-Tar.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- perl-Archive-Tar.spec 19 Feb 2007 21:37:19 -0000 1.22 +++ perl-Archive-Tar.spec 5 Mar 2007 21:52:04 -0000 1.23 @@ -1,6 +1,6 @@ Name: perl-Archive-Tar Version: 1.30 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A module for Perl manipulation of .tar files Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Mon Mar 05 2007 Robin Norwood - 1.30-4 +- Fix changelog + * Mon Feb 19 2007 Robin Norwood - 1.30-3 - Incorporate specfile improvements from Jose Oliveira. @@ -62,7 +65,7 @@ * Tue Sep 19 2006 Robin Norwood - 1.30-1 - Bump to 1.30 -* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +* Wed Jul 12 2006 Jesse Keating - 1.29-1.1 - rebuild * Wed Mar 08 2006 Jason Vas Dias - 1.29-1 From fedora-cvs-commits at redhat.com Mon Mar 5 22:04:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 17:04:24 -0500 Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.146,1.147 Message-ID: <200703052204.l25M4OI4008441@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8425 Modified Files: linux-2.6-compile-fixes.patch Log Message: remove more unnecessary diff linux-2.6-compile-fixes.patch: nv_backlight.c | 3 +++ 1 files changed, 3 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.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- linux-2.6-compile-fixes.patch 5 Mar 2007 19:34:10 -0000 1.146 +++ linux-2.6-compile-fixes.patch 5 Mar 2007 22:04:22 -0000 1.147 @@ -5,35 +5,6 @@ # to do a compile to figure out what your diff is fixing. Thanks. # - ---- linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c~ 2006-11-29 21:57:37.000000000 +0000 -+++ linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c 2006-12-13 16:53:11.000000000 +0000 -@@ -43,9 +43,11 @@ void __spin_yield(raw_spinlock_t *lock) - if (firmware_has_feature(FW_FEATURE_ISERIES)) - HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc, - ((u64)holder_cpu << 32) | yield_count); -+#ifdef CONFIG_PPC_PSERIES - else - plpar_hcall_norets(H_CONFER, - get_hard_smp_processor_id(holder_cpu), yield_count); -+#endif - } - - /* -@@ -72,9 +74,11 @@ void __rw_yield(raw_rwlock_t *rw) - if (firmware_has_feature(FW_FEATURE_ISERIES)) - HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc, - ((u64)holder_cpu << 32) | yield_count); -+#ifdef CONFIG_PPC_PSERIES - else - plpar_hcall_norets(H_CONFER, - get_hard_smp_processor_id(holder_cpu), yield_count); -+#endif - } - #endif - - - drivers/video/nvidia/nv_backlight.c: In function 'nvidia_bl_init': drivers/video/nvidia/nv_backlight.c:103: error: implicit declaration of function 'pmac_has_backlight_type' From fedora-cvs-commits at redhat.com Mon Mar 5 22:04:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 17:04:56 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2964,1.2965 Message-ID: <200703052204.l25M4um7008467@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8453 Modified Files: kernel-2.6.spec Log Message: * Mon Mar 05 2007 Dave Jones - Generate modules.(scsi|libata|networking) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2964 retrieving revision 1.2965 diff -u -r1.2964 -r1.2965 --- kernel-2.6.spec 5 Mar 2007 19:34:10 -0000 1.2964 +++ kernel-2.6.spec 5 Mar 2007 22:04:54 -0000 1.2965 @@ -1376,6 +1376,39 @@ # mark modules executable so that strip-to-file can strip them cat modnames | xargs chmod u+x + # Generate a list of modules for SCSI, sata/pata, and networking. + for i in `cat modnames | grep drivers\/scsi` + do + if [ $(nm $i |grep --count scsi_add_host) -ne 0 ]; + then + basename `echo $i` >> $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.scsi + fi + done + + for i in `cat modnames | grep drivers\/ata` + do + if [ $(nm $i |grep --count ata_device_add) -ne 0 ]; + then + basename `echo $i` >> $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.libata + fi + done + + for i in `cat modnames` + do + if [ $(nm $i |grep --count register_netdev) -ne 0 ]; + then + basename `echo $i` >> $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.networking + fi + done + + # detect missing or incorrect license tags + for i in `cat modnames` + do + echo -n "$i " + /sbin/modinfo -l $i >> modinfo + done + + # detect missing or incorrect license tags for i in `cat modnames` do @@ -2037,6 +2070,9 @@ %changelog * Mon Mar 05 2007 Dave Jones +- Generate modules.(scsi|libata|networking) + +* Mon Mar 05 2007 Dave Jones - 2.6.21rc2-git4 * Mon Mar 05 2007 Dave Jones From fedora-cvs-commits at redhat.com Mon Mar 5 22:11:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 17:11:52 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2965,1.2966 Message-ID: <200703052211.l25MBqX5008613@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8599 Modified Files: kernel-2.6.spec Log Message: avoid pulling libata into the scsi modules in a better manner Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2965 retrieving revision 1.2966 diff -u -r1.2965 -r1.2966 --- kernel-2.6.spec 5 Mar 2007 22:04:54 -0000 1.2965 +++ kernel-2.6.spec 5 Mar 2007 22:11:46 -0000 1.2966 @@ -1377,7 +1377,7 @@ cat modnames | xargs chmod u+x # Generate a list of modules for SCSI, sata/pata, and networking. - for i in `cat modnames | grep drivers\/scsi` + for i in `cat modnames | grep -v drivers\/ata` do if [ $(nm $i |grep --count scsi_add_host) -ne 0 ]; then From fedora-cvs-commits at redhat.com Mon Mar 5 22:33:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 17:33:51 -0500 Subject: rpms/xorg-x11-server/devel .cvsignore, 1.20, 1.21 sources, 1.15, 1.16 xorg-x11-server-1.2.0-selinux-awareness.patch, 1.1, 1.2 xorg-x11-server.spec, 1.208, 1.209 xserver-1.2.0-glcore-visual-count.patch, 1.1, NONE xserver-1.2.0-int10-rdtsc.patch, 1.1, NONE xserver-1.2.0-os-memory-leak.patch, 1.1, NONE xserver-1.2.0-proper-randr-version.patch, 1.1, NONE xserver-1.2.0-xfixes-clientgone-check.patch, 1.1, NONE Message-ID: <200703052233.l25MXpaY017988@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17939/devel Modified Files: .cvsignore sources xorg-x11-server-1.2.0-selinux-awareness.patch xorg-x11-server.spec Removed Files: xserver-1.2.0-glcore-visual-count.patch xserver-1.2.0-int10-rdtsc.patch xserver-1.2.0-os-memory-leak.patch xserver-1.2.0-proper-randr-version.patch xserver-1.2.0-xfixes-clientgone-check.patch Log Message: auto-import xorg-x11-server-1.2.99.901-1.fc7 on branch devel from xorg-x11-server-1.2.99.901-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 23 Jan 2007 19:24:00 -0000 1.20 +++ .cvsignore 5 Mar 2007 22:33:49 -0000 1.21 @@ -1 +1 @@ -xorg-server-1.2.0.tar.bz2 +xorg-server-1.2.99.901.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 23 Jan 2007 19:24:01 -0000 1.15 +++ sources 5 Mar 2007 22:33:49 -0000 1.16 @@ -1 +1 @@ -849131833c15c049135f1f309f5f9197 xorg-server-1.2.0.tar.bz2 +7fa14761413ffaf36c0bf591cf419709 xorg-server-1.2.99.901.tar.bz2 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(-) Index: xorg-x11-server-1.2.0-selinux-awareness.patch =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.2.0-selinux-awareness.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xorg-x11-server-1.2.0-selinux-awareness.patch 23 Jan 2007 19:24:01 -0000 1.1 +++ xorg-x11-server-1.2.0-selinux-awareness.patch 5 Mar 2007 22:33:49 -0000 1.2 @@ -1,5 +1,5 @@ ---- 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 +--- xserver-20070223/hw/xfree86/dixmods/Makefile.am.selinux-awareness 2007-02-23 11:20:30.000000000 -0500 ++++ xserver-20070223/hw/xfree86/dixmods/Makefile.am 2007-02-23 11:24:32.000000000 -0500 @@ -42,7 +42,7 @@ -I$(top_srcdir)/GL/glx @@ -9,8 +9,8 @@ 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 +--- xserver-20070223/configure.ac.selinux-awareness 2007-02-23 11:24:31.000000000 -0500 ++++ xserver-20070223/configure.ac 2007-02-23 11:25:38.000000000 -0500 @@ -237,6 +237,8 @@ ;; esac @@ -20,12 +20,12 @@ 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 @@ +@@ -1010,7 +1012,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" +- 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 $LIBS" ++ 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 $LIBS $XSERVER_LIBS" AC_SUBST([XNEST_LIBS]) fi Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- xorg-x11-server.spec 2 Mar 2007 10:30:15 -0000 1.208 +++ xorg-x11-server.spec 5 Mar 2007 22:33:49 -0000 1.209 @@ -8,8 +8,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.2.0 -Release: 10%{?dist} +Version: 1.2.99.901 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -47,15 +47,10 @@ 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 -Patch1010: xserver-1.2.0-proper-randr-version.patch Patch2001: xserver-1.2.0-geode-mmx.patch Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch Patch2003: xserver-1.2.0-vfprintf.patch -Patch2004: xserver-1.2.0-xfixes-clientgone-check.patch -Patch2005: xserver-1.2.0-os-memory-leak.patch -Patch2006: xserver-1.2.0-int10-rdtsc.patch -Patch2007: xserver-1.2.0-glcore-visual-count.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -271,15 +266,10 @@ %patch1007 -p1 -b .xf1bpp %patch1008 -p1 -b .comment-less %patch1009 -p1 -b .maxpixclock -%patch1010 -p1 -b .randr-version %patch2001 -p1 -b .geode-mmx %patch2002 -p1 -b .xephyr-keysym %patch2003 -p1 -b .vfprintf -%patch2004 -p1 -b .clientgone -%patch2005 -p1 -b .osclient -%patch2006 -p1 -b .rdtsc -%patch2007 -p1 -b .glcore-crash %build @@ -315,7 +305,7 @@ %endif ${CONFIGURE} -make %{?_smp_mflags} +make -s %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -323,8 +313,6 @@ %if %{with_hw_servers} -# FIXME: This should be done upstream, so it's one less thing to hack. -# Make these directories now so the Xorg package can own them. mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input} # Install the vesamodes and extramodes files to let our install/config tools @@ -354,27 +342,17 @@ find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl)$' | xargs tar cf - | (cd %{inst_srcdir} && tar xf -) -# FIXME: Remove unwanted files/dirs +# Remove unwanted files/dirs { rm -f $RPM_BUILD_ROOT%{_bindir}/xorgconfig rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xorgconfig.1* rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Cards rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Options - rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/cfg.sample - rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/xorg.cfg - rm -f $RPM_BUILD_ROOT%{_bindir}/getconfig - rm -f $RPM_BUILD_ROOT%{_bindir}/getconfig.pl - rm -f $RPM_BUILD_ROOT%{_bindir}/inb - rm -f $RPM_BUILD_ROOT%{_bindir}/inl - rm -f $RPM_BUILD_ROOT%{_bindir}/inw + rm -f $RPM_BUILD_ROOT%{_bindir}/in? rm -f $RPM_BUILD_ROOT%{_bindir}/ioport - rm -f $RPM_BUILD_ROOT%{_bindir}/outb - rm -f $RPM_BUILD_ROOT%{_bindir}/outl - rm -f $RPM_BUILD_ROOT%{_bindir}/outw + rm -f $RPM_BUILD_ROOT%{_bindir}/out? rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1* - rm -f $RPM_BUILD_ROOT%{_mandir}/man1/getconfig.1* - rm -f $RPM_BUILD_ROOT%{_mandir}/man5/getconfig.5* # Remove all libtool archives (*.la) find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || : @@ -388,6 +366,7 @@ # /usr/share/aclocal/xorg-server.m4 # /usr/share/man/man1/Xserver.1x.gz # /var/lib/xkb/README.compiled + rm -f $RPM_BUILD_ROOT/randrstr.h rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal @@ -453,8 +432,6 @@ %if %{with_hw_servers} %files Xorg %defattr(-,root,root,-) -# FIXME: The build fails to find the Changelog for some reason. -#%doc ChangeLog %{_bindir}/X %attr(4711, root, root) %{_bindir}/Xorg %{_bindir}/gtf @@ -490,10 +467,8 @@ %{_libdir}/xorg/modules/libafb.so %{_libdir}/xorg/modules/libcfb.so %{_libdir}/xorg/modules/libcfb32.so -%{_libdir}/xorg/modules/libddc.so %{_libdir}/xorg/modules/libexa.so %{_libdir}/xorg/modules/libfb.so -%{_libdir}/xorg/modules/libi2c.so %{_libdir}/xorg/modules/libint10.so %{_libdir}/xorg/modules/libmfb.so %{_libdir}/xorg/modules/libpcidata.so @@ -509,16 +484,12 @@ %{_libdir}/xorg/modules/libxf8_32bpp.so %dir %{_libdir}/xserver %{_libdir}/xserver/SecurityPolicy -#%dir %{_mandir}/man1x %{_mandir}/man1/gtf.1* %{_mandir}/man1/Xorg.1* %{_mandir}/man1/Xserver.1* %{_mandir}/man1/cvt.1* -#%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 %{_localstatedir}/lib/xkb/README.compiled @@ -528,7 +499,6 @@ %files Xnest %defattr(-,root,root,-) %{_bindir}/Xnest -#%dir %{_mandir}/man1x %{_mandir}/man1/Xnest.1* %{_mandir}/man1/Xserver.1* @@ -547,7 +517,6 @@ %{_bindir}/vdltodmx %{_bindir}/xdmx %{_bindir}/xdmxconfig -#%dir %{_mandir}/man1x %{_mandir}/man1/Xdmx.1* %{_mandir}/man1/dmxtodmx.1* %{_mandir}/man1/vdltodmx.1* @@ -558,7 +527,6 @@ %files Xvfb %defattr(-,root,root,-) %{_bindir}/Xvfb -#%dir %{_mandir}/man1x %{_mandir}/man1/Xvfb.1* %{_mandir}/man1/Xserver.1* %if !%{with_hw_servers} @@ -570,9 +538,6 @@ %files Xephyr %defattr(-,root,root,-) %{_bindir}/Xephyr -# no manpage yet -#%dir %{_mandir}/man1x -#%{_mandir}/man1/Xephyr.1* %{_mandir}/man1/Xserver.1* @@ -582,7 +547,6 @@ %{_libdir}/libxf86config.a %{_libdir}/pkgconfig/xorg-server.pc %dir %{_includedir}/xorg -#%dir %{_includedir}/xorg/sdk %{sdkdir}/*.h %{_datadir}/aclocal/xorg-server.m4 %endif @@ -593,6 +557,12 @@ %changelog +* Mon Mar 05 2007 Adam Jackson 1.2.99.901-1 +- xserver 1.3 RC1. RANDR 1.2 hotness in the hizzouse. +- xserver-1.2.0-honor-displaysize.patch: Honor the DisplaySize config + directive again (#220248) +- Clean up the post-install cleanup + * Fri Mar 02 2007 Adam Tkac 1.2.0-10 - change permissions of files in source package to default from read-only --- xserver-1.2.0-glcore-visual-count.patch DELETED --- --- xserver-1.2.0-int10-rdtsc.patch DELETED --- --- xserver-1.2.0-os-memory-leak.patch DELETED --- --- xserver-1.2.0-proper-randr-version.patch DELETED --- --- xserver-1.2.0-xfixes-clientgone-check.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 5 22:47:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 17:47:27 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.380, 1.381 anaconda.spec, 1.507, 1.508 sources, 1.504, 1.505 Message-ID: <200703052247.l25MlRlg027883@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27835/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.29-1 on branch devel from anaconda-11.2.0.29-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.380 retrieving revision 1.381 diff -u -r1.380 -r1.381 --- .cvsignore 1 Mar 2007 22:27:31 -0000 1.380 +++ .cvsignore 5 Mar 2007 22:47:25 -0000 1.381 @@ -1,5 +1 @@ -anaconda-11.2.0.24.tar.bz2 -anaconda-11.2.0.25.tar.bz2 -anaconda-11.2.0.26.tar.bz2 -anaconda-11.2.0.27.tar.bz2 -anaconda-11.2.0.28.tar.bz2 +anaconda-11.2.0.29.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.507 retrieving revision 1.508 diff -u -r1.507 -r1.508 --- anaconda.spec 1 Mar 2007 22:27:31 -0000 1.507 +++ anaconda.spec 5 Mar 2007 22:47:25 -0000 1.508 @@ -1,25 +1,26 @@ Name: anaconda -Version: 11.2.0.28 +Version: 11.2.0.29 Release: 1 License: GPL Summary: Graphical system installer Group: Applications/System Source: anaconda-%{PACKAGE_VERSION}.tar.bz2 -BuildPreReq: kudzu-devel >= 1.2.42, pciutils-devel -BuildPreReq: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel -BuildPreReq: rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11 -BuildPreReq: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel -BuildPreReq: beecrypt-devel, libselinux-devel >= 1.6, libX11-devel -BuildPreReq: libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber -BuildPreReq: pykickstart >= 0.96, yum >= 2.9.2, +BuildRequires: kudzu-devel >= 1.2.42, pciutils-devel +BuildRequires: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel +BuildRequires: rpm-python >= 4.2-0.61, rpm-devel, gettext >= 0.11 +BuildRequires: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel +BuildRequires: beecrypt-devel, libselinux-devel >= 1.6, libX11-devel +BuildRequires: libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber +BuildRequires: pykickstart >= 0.96, yum >= 2.9.2, %define dmver 1.02.17-6 -BuildPreReq: device-mapper-devel >= %{dmver} -BuildPreReq: libsepol-devel -BuildPreReq: pango-devel, pirut, libXt-devel -BuildPreReq: slang-devel >= 2.0.6-2, slang-static -BuildPreReq: glib2-devel >= 2.11.1-5, glib2-static -BuildPreReq: libdhcp-devel >= 1.19, mkinitrd-devel >= 5.1.2-1 -BuildPreReq: audit-libs-devel +BuildRequires: device-mapper-devel >= %{dmver} +BuildRequires: libsepol-devel +BuildRequires: pango-devel, pirut, libXt-devel +BuildRequires: slang-devel >= 2.0.6-2, slang-static +BuildRequires: newt-devel, newt-static +BuildRequires: glib2-devel >= 2.11.1-5, glib2-static +BuildRequires: libdhcp-devel >= 1.19, mkinitrd-devel >= 5.1.2-1 +BuildRequires: audit-libs-devel Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty Requires: parted >= 1.8.1, pyparted >= 1.8.1 Requires: kudzu >= 1.2.42, yum >= 2.9.2, pirut >= 1.1.0 @@ -112,6 +113,15 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Mar 5 2007 Jeremy Katz - 11.2.0.29-1 +- Fix some typos (clumens, dcantrell, katzj) +- Use depsolving from yum instead of our own stuff now that the yum + depsolving doesn't require header downloads +- Misc backend cleanups +- Fix deprecation warnings (#230951) +- Networking fixing (#210370) +- BR newt-static + * Thu Mar 01 2007 Chris Lumens - 11.2.0.28-1 - Support multiple %ksappend lines (#222201). - Set the ksdata after setting the initial timezone values (#230472). Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.504 retrieving revision 1.505 diff -u -r1.504 -r1.505 --- sources 1 Mar 2007 22:27:31 -0000 1.504 +++ sources 5 Mar 2007 22:47:25 -0000 1.505 @@ -1 +1 @@ -afe55badf06b61740cd94e87bb030be2 anaconda-11.2.0.28.tar.bz2 +04d921c05ca5ba3e94dbe19586151e7b anaconda-11.2.0.29.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 5 22:47:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 17:47:42 -0500 Subject: rpms/dhcp/devel .cvsignore, 1.15, 1.16 dhcp.spec, 1.146, 1.147 sources, 1.16, 1.17 README.ldap, 1.1, NONE dhcp-3.0.5-ldap-configuration.patch, 1.3, NONE dhcpd-conf-to-ldap.pl, 1.1, NONE draft-ietf-dhc-ldap-schema-01.txt, 1.1, NONE Message-ID: <200703052247.l25MlgUC028049@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28013 Modified Files: .cvsignore dhcp.spec sources Removed Files: README.ldap dhcp-3.0.5-ldap-configuration.patch dhcpd-conf-to-ldap.pl draft-ietf-dhc-ldap-schema-01.txt Log Message: * Mon Mar 05 2007 David Cantrell - 12:3.0.5-26 - Use better upstream version of the LDAP configuration patch (#225691) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 7 Nov 2006 15:49:44 -0000 1.15 +++ .cvsignore 5 Mar 2007 22:47:40 -0000 1.16 @@ -1 +1,2 @@ dhcp-3.0.5.tar.gz +dhcp-3.0.5-ldap-patch Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- dhcp.spec 5 Mar 2007 18:19:42 -0000 1.146 +++ dhcp.spec 5 Mar 2007 22:47:40 -0000 1.147 @@ -10,7 +10,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Name: dhcp Version: 3.0.5 -Release: 25%{?dist} +Release: 26%{?dist} Epoch: 12 License: ISC Group: System Environment/Daemons @@ -21,10 +21,8 @@ Source3: dhcrelay.init Source4: dhcpd.conf Source5: libdhcp4client.pc -Source6: README.ldap -Source7: draft-ietf-dhc-ldap-schema-01.txt -Source8: dhcpd-conf-to-ldap.pl -Source9: linux.dbus-example +Source6: linux.dbus-example +Source7: http://home.ntelos.net/~masneyb/%{name}-%{version}-ldap-patch Patch0: dhcp-3.0.5-extended-new-option-info.patch Patch1: dhcp-3.0.5-Makefile.patch @@ -40,8 +38,7 @@ Patch11: dhcp-3.0.5-timeouts.patch Patch12: dhcp-3.0.5-fix-warnings.patch Patch13: dhcp-3.0.5-xen-checksum.patch -Patch14: dhcp-3.0.5-ldap-configuration.patch -Patch15: dhcp-3.0.5-no-win32.patch +Patch14: dhcp-3.0.5-no-win32.patch # adds libdhcp4client to the ISC code base Patch50: dhcp-3.0.5-libdhcp4client.patch @@ -155,27 +152,25 @@ # Fix Xen host networking problems (partial checksums) #%patch13 -p1 -b .xen -# Add support for dhcpd.conf data in LDAP -%patch14 -p1 -b .ldapconf - # The contrib/ms2isc/Registry.pm file requires Win32API::Registry, which is # not part of Fedora by default. We comment out this use line in the script # so that RPM doesn't automatically add perl(Win32API::Registry) dependency. # The patch puts a comment in the script telling the user which perl module # should be installed to use the Registry.pm contrib file. -%patch15 -p1 -b .no-win32 +%patch14 -p1 -b .no-win32 -# Add the libdhcp4client target (library version of dhclient) -%patch50 -p1 -b .libdhcp4client +# Add support for dhcpd.conf data in LDAP. This patch is from an upstream +# location, so we refer to the source file here and manually invoke the +# patch command. +%{__patch} -p1 -b -z .ldap < %SOURCE7 -# Copy in documentation and example scripts for LDAP patch to dhcpd -%{__cp} -p %SOURCE6 . -%{__cp} -p %SOURCE7 doc -%{__cp} -p %SOURCE8 contrib +# Add the libdhcp4client target (library version of dhclient). This must be +# the last patch applied to the source tree. +%patch50 -p1 -b .libdhcp4client # Copy in example dhclient script for use with D-BUS (requires extended # new option info patch too) -%{__cp} -p %SOURCE9 client/scripts +%{__cp} -p %SOURCE6 client/scripts %build %{__cp} %SOURCE1 . @@ -335,6 +330,9 @@ %{_libdir}/libdhcp4client.so %changelog +* Mon Mar 05 2007 David Cantrell - 12:3.0.5-26 +- Use better upstream version of the LDAP configuration patch (#225691) + * Mon Mar 05 2007 David Cantrell - 12:3.0.5-25 - Man pages need 0644 permissions (#222572) Index: sources =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 7 Nov 2006 15:49:44 -0000 1.16 +++ sources 5 Mar 2007 22:47:40 -0000 1.17 @@ -1 +1,2 @@ ce5d30d4645e4eab1f54561b487d1ec7 dhcp-3.0.5.tar.gz +41cde9e9a768bf12390288465ef30bbd dhcp-3.0.5-ldap-patch --- README.ldap DELETED --- --- dhcp-3.0.5-ldap-configuration.patch DELETED --- --- dhcpd-conf-to-ldap.pl DELETED --- --- draft-ietf-dhc-ldap-schema-01.txt DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 5 22:51:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 17:51:31 -0500 Subject: rpms/dhcp/devel README.ldap, 1.2, 1.3 dhcp-3.0.5-ldap-configuration.patch, 1.4, 1.5 dhcpd-conf-to-ldap.pl, 1.2, 1.3 draft-ietf-dhc-ldap-schema-01.txt, 1.2, 1.3 .cvsignore, 1.16, 1.17 dhcp.spec, 1.147, 1.148 sources, 1.17, 1.18 Message-ID: <200703052251.l25MpVBR023740@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23588 Modified Files: .cvsignore dhcp.spec sources Added Files: README.ldap dhcp-3.0.5-ldap-configuration.patch dhcpd-conf-to-ldap.pl draft-ietf-dhc-ldap-schema-01.txt Log Message: Revert to previous LDAP patch. Index: README.ldap =================================================================== RCS file: README.ldap diff -N README.ldap --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ README.ldap 5 Mar 2007 22:51:29 -0000 1.3 @@ -0,0 +1,157 @@ +LDAP Support in DHCP +Brian Masney +Last updated 8/16/2002 + +This document describes setting up the DHCP server to read it's configuration +from LDAP. This work is based on the IETF document +draft-ietf-dhc-ldap-schema-01.txt included in the doc directory. For the latest +version of this document, please see http://home.ntelos.net/~masneyb. + +First question on most people's mind is "Why do I want to store my +configuration in LDAP?" If you run a small DHCP server, and the configuration +on it rarely changes, then you won't need to store your configuration in LDAP. +But, if you have several DHCP servers, and you want an easy way to manage your +configuration, this can be a solution. + +The first step will be to setup your LDAP server. I am using OpenLDAP from +www.openldap.org. Building and installing OpenLDAP is beyond the scope of this +document. There is plenty of documentation out there about this. Once you have +OpenLDAP installed, you will have to edit your slapd.conf file. I added the +following 2 lines to my configuration file: + +include /etc/ldap/schema/dhcp.schema +index dhcpHWAddress eq +index dhcpClassData eq + +The first line tells it to include the dhcp schema file. You will find this +file under the contrib directory in this distribution. You will need to copy +this file to where your other schema files are (maybe +/usr/local/openldap/etc/openldap/schema/). The second line sets up +an index for the dhcpHWAddress parameter. The third parameter is for reading +subclasses from LDAP every time a DHCP request comes in. Make sure you run the +slapindex command and restart slapd to have these changes to into effect. + +Now that you have LDAP setup, you should be able to use gq (http://biot.com/gq/) +to verify that the dhcp schema file is loaded into LDAP. Pull up gq, and click +on the Schema tab. Go under objectClasses, and you should see at least the +following object classes listed: dhcpClass, dhcpGroup, dhcpHost, dhcpOptions, +dhcpPool, dhcpServer, dhcpService, dhcpSharedNetwork, dhcpSubClass, and +dhcpSubnet. If you do not see these, you need to check over your LDAP +configuration before you go any further. + +You should be ready to build DHCP. Edit the includes/site.h file and uncomment +the #define LDAP_CONFIGURATION. Now run configure in the base source directory. +Edit the work.os/server/Makefile and add -lldap to the LIBS= line. (replace os +with your operating system, linux-2.2 on my machine). You should be able to +type make to build your DHCP server. + +Once you have DHCP installed, you will need to setup your initial plaintext +config file. In my /etc/dhcpd.conf file, I have: + +ldap-server "localhost"; +ldap-port 389; +ldap-username "cn=DHCP User, dc=ntelos, dc=net"; +ldap-password "blah"; +ldap-base-dn "dc=ntelos, dc=net"; +ldap-method dynamic; + +All of these parameters should be self explanatory except for the ldap-method. +You can set this to static or dynamic. If you set it to static, the +configuration is read once on startup, and LDAP isn't used anymore. But, if you +set this to dynamic, the configuration is read once on startup, and the +hosts that are stored in LDAP are looked up every time a DHCP request comes in. + +The next step is to set up your LDAP tree. Here is an example config that will +give a 10.100.0.x address to machines that have a host entry in LDAP. +Otherwise, it will give a 10.200.0.x address to them. (NOTE: replace +dc=ntelos, dc=net with your base dn). If you would like to convert your +existing dhcpd.conf file to LDIF format, there is a script +contrib/dhcpd-conf-to-ldap.pl that will convert it for you. + +# You must specify the server's host name in LDAP that you are going to run +# DHCP on and point it to which config tree you want to use. Whenever DHCP +# first starts up, it will do a search for this entry to find out which +# config to use +dn: cn=brian.ntelos.net, dc=ntelos, dc=net +objectClass: top +objectClass: dhcpServer +cn: brian.ntelos.net +dhcpServiceDN: cn=DHCP Service Config, dc=ntelos, dc=net + +# Here is the config tree that brian.ntelos.net points to. +dn: cn=DHCP Service Config, dc=ntelos, dc=net +cn: DHCP Service Config +objectClass: top +objectClass: dhcpService +dhcpPrimaryDN: dc=ntelos, dc=net +dhcpStatements: ddns-update-style ad-hoc +dhcpStatements: default-lease-time 600 +dhcpStatements: max-lease-time 7200 + +# Set up a shared network segment +dn: cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net +cn: WV +objectClass: top +objectClass: dhcpSharedNetwork + +# Set up a subnet declaration with a pool statement. Also note that we have +# a dhcpOptions object with this entry +dn: cn=10.100.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net +cn: 10.100.0.0 +objectClass: top +objectClass: dhcpSubnet +objectClass: dhcpOptions +dhcpOption: domain-name-servers 10.100.0.2 +dhcpOption: routers 10.100.0.1 +dhcpOption: subnet-mask 255.255.255.0 +dhcpOption: broadcast-address 10.100.0.255 +dhcpNetMask: 24 + +# Set up a pool for this subnet. Only known hosts will get these IPs +dn: cn=Known Pool, cn=10.100.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net +cn: Known Pool +objectClass: top +objectClass: dhcpPool +dhcpRange: 10.100.0.3 10.100.0.254 +dhcpPermitList: deny unknown-clients + +# Set up another subnet declaration with a pool statement +dn: cn=10.200.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net +cn: 10.200.0.0 +objectClass: top +objectClass: dhcpSubnet +objectClass: dhcpOptions +dhcpOption: domain-name-servers 10.200.0.2 +dhcpOption: routers 10.200.0.1 +dhcpOption: subnet-mask 255.255.255.0 +dhcpOption: broadcast-address 10.200.0.255 +dhcpNetMask: 24 + +# Set up a pool for this subnet. Only unknown hosts will get these IPs +dn: cn=Known Pool, cn=10.200.0.0, cn=WV Test, cn=DHCP Service Config, dc=ntelos, dc=net +cn: Known Pool +objectClass: top +objectClass: dhcpPool +dhcpRange: 10.200.0.3 10.200.0.254 +dhcpPermitList: deny known clients + +# Set aside a group for all of our known MAC addresses +dn: cn=Customers, cn=DHCP Service Config, dc=ntelos, dc=net +objectClass: top +objectClass: dhcpGroup +cn: Customers + +# Host entry for my laptop +dn: cn=brianlaptop, cn=Customers, cn=DHCP Service Config, dc=ntelos, dc=net +objectClass: top +objectClass: dhcpHost +cn: brianlaptop +dhcpHWAddress: ethernet 00:00:00:00:00:00 + +You can use the command slapadd to load all of these entries into your LDAP +server. After you load this, you should be able to start up DHCP. If you run +into problems reading the configuration, try running dhcpd with the -d flag. +If you still have problems, edit the site.conf file in the DHCP source and +add the line: COPTS= -DDEBUG_LDAP and recompile DHCP. (make sure you run make +clean and rerun configure before you rebuild). + dhcp-3.0.5-ldap-configuration.patch: common/conflex.c | 46 +- common/print.c | 6 includes/dhcpd.h | 50 ++ includes/site.h | 10 server/Makefile.dist | 6 server/class.c | 17 server/confpars.c | 12 server/dhcpd.c | 3 server/ldap.c | 1142 +++++++++++++++++++++++++++++++++++++++++++++++++++ server/mdb.c | 6 server/stables.c | 23 + 11 files changed, 1295 insertions(+), 26 deletions(-) Index: dhcp-3.0.5-ldap-configuration.patch =================================================================== RCS file: dhcp-3.0.5-ldap-configuration.patch diff -N dhcp-3.0.5-ldap-configuration.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ dhcp-3.0.5-ldap-configuration.patch 5 Mar 2007 22:51:29 -0000 1.5 @@ -0,0 +1,1489 @@ +--- dhcp-3.0.5/common/conflex.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/common/conflex.c 2007-03-04 15:32:24.000000000 -0500 +@@ -47,6 +47,7 @@ + static enum dhcp_token read_number PROTO ((int, struct parse *)); + static enum dhcp_token read_num_or_name PROTO ((int, struct parse *)); + static enum dhcp_token intern PROTO ((char *, enum dhcp_token)); ++static int read_function PROTO ((struct parse *)); + + isc_result_t new_parse (cfile, file, inbuf, buflen, name, eolp) + struct parse **cfile; +@@ -74,6 +75,10 @@ + tmp -> file = file; + tmp -> eol_token = eolp; + ++ if (file != -1) { ++ tmp -> read_function = read_function;; ++ } ++ + tmp -> bufix = 0; + tmp -> buflen = buflen; + if (inbuf) { +@@ -113,22 +118,11 @@ + int c; + + if (cfile -> bufix == cfile -> buflen) { +- if (cfile -> file != -1) { +- cfile -> buflen = +- read (cfile -> file, +- cfile -> inbuf, cfile -> bufsiz); +- if (cfile -> buflen == 0) { +- c = EOF; +- cfile -> bufix = 0; +- } else if (cfile -> buflen < 0) { +- c = EOF; +- cfile -> bufix = cfile -> buflen = 0; +- } else { +- c = cfile -> inbuf [0]; +- cfile -> bufix = 1; +- } +- } else ++ if (cfile -> read_function) { ++ c = cfile -> read_function (cfile); ++ } else { + c = EOF; ++ } + } else { + c = cfile -> inbuf [cfile -> bufix]; + cfile -> bufix++; +@@ -1130,3 +1124,25 @@ + } + return dfv; + } ++ ++ ++static int ++read_function (struct parse * cfile) ++{ ++ int c; ++ ++ cfile -> buflen = read (cfile -> file, cfile -> inbuf, cfile -> bufsiz); ++ if (cfile -> buflen == 0) { ++ c = EOF; ++ cfile -> bufix = 0; ++ } else if (cfile -> buflen < 0) { ++ c = EOF; ++ cfile -> bufix = cfile -> buflen = 0; ++ } else { ++ c = cfile -> inbuf [0]; ++ cfile -> bufix = 1; ++ } ++ ++ return c; ++} ++ +--- dhcp-3.0.5/common/print.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/common/print.c 2007-03-04 15:32:24.000000000 -0500 +@@ -166,9 +166,9 @@ + } + + char *print_hw_addr (htype, hlen, data) +- int htype; +- int hlen; +- unsigned char *data; ++ const int htype; ++ const int hlen; ++ const unsigned char *data; + { + static char habuf [49]; + char *s; +--- dhcp-3.0.5/includes/dhcpd.h.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/includes/dhcpd.h 2007-03-04 15:32:24.000000000 -0500 +@@ -79,6 +79,11 @@ + #include + #include + ++#if defined(LDAP_CONFIGURATION) ++# include ++# include /* for uname() */ ++#endif ++ + #if !defined (OPTION_HASH_SIZE) + # define OPTION_HASH_SIZE 17 + # define OPTION_HASH_PTWO 32 /* Next power of two above option hash. */ +@@ -139,6 +144,8 @@ + char *inbuf; + unsigned bufix, buflen; + unsigned bufsiz; ++ ++ int (*read_function) (struct parse *); + }; + + /* Variable-length array of data. */ +@@ -244,6 +251,27 @@ + u_int8_t hbuf [17]; + }; + ++#if defined(LDAP_CONFIGURATION) ++# define LDAP_BUFFER_SIZE 8192 ++# define LDAP_METHOD_STATIC 0 ++# define LDAP_METHOD_DYNAMIC 1 ++ ++/* This is a tree of the current configuration we are building from LDAP */ ++ ++struct ldap_config_stack { ++ LDAPMessage * res; /* Pointer returned from ldap_search */ ++ LDAPMessage * ldent; /* Current item in LDAP that we're processing ++ in res */ ++ int close_brace; /* Put a closing } after we're through with ++ this item */ ++ int processed; /* We set this flag if this base item has been ++ processed. After this base item is processed, ++ we can start processing the children */ ++ struct ldap_config_stack *children; ++ struct ldap_config_stack *next; ++}; ++#endif ++ + typedef enum { + server_startup = 0, + server_running = 1, +@@ -426,6 +454,15 @@ + # define DEFAULT_PING_TIMEOUT 1 + #endif + ++#if defined(LDAP_CONFIGURATION) ++# define SV_LDAP_SERVER 46 ++# define SV_LDAP_PORT 47 ++# define SV_LDAP_USERNAME 48 ++# define SV_LDAP_PASSWORD 49 ++# define SV_LDAP_BASE_DN 50 ++# define SV_LDAP_METHOD 51 ++#endif ++ + #if !defined (DEFAULT_DEFAULT_LEASE_TIME) + # define DEFAULT_DEFAULT_LEASE_TIME 43200 + #endif +@@ -1526,7 +1563,7 @@ + char *quotify_string (const char *, const char *, int); + char *quotify_buf (const unsigned char *, unsigned, const char *, int); + char *print_base64 (const unsigned char *, unsigned, const char *, int); +-char *print_hw_addr PROTO ((int, int, unsigned char *)); ++char *print_hw_addr PROTO ((const int, const int, const unsigned char *)); + void print_lease PROTO ((struct lease *)); + void dump_raw PROTO ((const unsigned char *, unsigned)); + void dump_packet_option (struct option_cache *, struct packet *, +@@ -2640,3 +2677,14 @@ + #endif /* FAILOVER_PROTOCOL */ + + const char *binding_state_print (enum failover_state); ++ ++/* ldap.c */ ++#if defined(LDAP_CONFIGURATION) ++extern struct enumeration ldap_methods; ++isc_result_t ldap_read_config (void); ++int find_haddr_in_ldap (struct host_decl **, int, unsigned, ++ const unsigned char *, const char *, int); ++int find_subclass_in_ldap (struct class *, struct class **, ++ struct data_string *); ++#endif ++ +--- dhcp-3.0.5/includes/site.h.ldapconf 2002-03-12 13:33:39.000000000 -0500 ++++ dhcp-3.0.5/includes/site.h 2007-03-04 15:32:24.000000000 -0500 +@@ -177,3 +177,13 @@ + traces. */ + + #define TRACING ++ ++/* Define this if you want to read your config from LDAP. Read README.ldap ++ about how to set this up */ ++ ++#define LDAP_CONFIGURATION ++ ++#define _PATH_DHCPD_DB "/var/lib/dhcpd/dhcpd.leases" ++#define _PATH_DHCLIENT_DB "/var/lib/dhclient/dhclient.leases" ++#define _PATH_DHCPD_DB "/var/lib/dhcpd/dhcpd.leases" ++#define _PATH_DHCLIENT_DB "/var/lib/dhclient/dhclient.leases" +--- dhcp-3.0.5/server/Makefile.dist.ldapconf 2004-06-10 13:59:50.000000000 -0400 ++++ dhcp-3.0.5/server/Makefile.dist 2007-03-04 15:33:01.000000000 -0500 +@@ -25,9 +25,9 @@ + CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 + SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5 + SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ +- omapi.c mdb.c stables.c salloc.c ddns.c ++ omapi.c mdb.c stables.c salloc.c ddns.c ldap.c + OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \ +- omapi.o mdb.o stables.o salloc.o ddns.o ++ omapi.o mdb.o stables.o salloc.o ddns.o ldap.o + PROG = dhcpd + MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 + +@@ -103,6 +103,6 @@ + -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5 + + dhcpd: $(OBJS) $(COBJ) $(DHCPLIB) +- $(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) ++ $(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) -lldap + + # Dependencies (semi-automatically-generated) +--- dhcp-3.0.5/server/class.c.ldapconf 2004-06-10 13:59:51.000000000 -0400 ++++ dhcp-3.0.5/server/class.c 2007-03-04 15:32:24.000000000 -0500 +@@ -90,6 +90,7 @@ + int matched = 0; + int status; + int ignorep; ++ int classfound; + + for (class = collection -> classes; class; class = class -> nic) { + #if defined (DEBUG_CLASS_MATCHING) +@@ -135,9 +136,19 @@ + class -> submatch, MDL)); + if (status && data.len) { + nc = (struct class *)0; +- if (class_hash_lookup (&nc, class -> hash, +- (const char *)data.data, +- data.len, MDL)) { ++ classfound = class_hash_lookup (&nc, ++ class -> hash, ++ (const char *)data.data, ++ data.len, MDL); ++ ++#ifdef LDAP_CONFIGURATION ++ if (!classfound && ++ find_subclass_in_ldap (class, ++ &nc, &data)) ++ classfound = 1; ++#endif ++ ++ if (classfound) { + #if defined (DEBUG_CLASS_MATCHING) + log_info ("matches subclass %s.", + print_hex_1 (data.len, +--- dhcp-3.0.5/server/confpars.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/server/confpars.c 2007-03-04 15:32:24.000000000 -0500 +@@ -63,7 +63,17 @@ + + isc_result_t readconf () + { +- return read_conf_file (path_dhcpd_conf, root_group, ROOT_GROUP, 0); ++ isc_result_t res; ++ ++ res = read_conf_file (path_dhcpd_conf, root_group, ROOT_GROUP, 0); ++#if defined(LDAP_CONFIGURATION) ++ if (res != ISC_R_SUCCESS) ++ return (res); ++ ++ return ldap_read_config (); ++#else ++ return (res); ++#endif + } + + isc_result_t read_conf_file (const char *filename, struct group *group, +--- dhcp-3.0.5/server/dhcpd.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/server/dhcpd.c 2007-03-04 15:32:24.000000000 -0500 +@@ -433,6 +433,9 @@ + /* Add the ddns update style enumeration prior to parsing. */ + add_enumeration (&ddns_styles); + add_enumeration (&syslog_enum); ++#if defined (LDAP_CONFIGURATION) ++ add_enumeration (&ldap_methods); ++#endif + + if (!group_allocate (&root_group, MDL)) + log_fatal ("Can't allocate root group!"); +--- /dev/null 2007-03-03 18:04:36.394738328 -0500 ++++ dhcp-3.0.5/server/ldap.c 2007-03-04 15:32:24.000000000 -0500 +@@ -0,0 +1,1142 @@ ++/* ldap.c ++ ++ Routines for reading the configuration from LDAP */ ++ ++/* ++ * Copyright (c) 1996-2001 Ntelos, Inc. ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. Neither the name of The Internet Software Consortium nor the names ++ * of its contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND ++ * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ++ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++ * DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ++ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ++ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ * ++ * This LDAP module was written by Brian Masney . It's ++ * development was sponsored by Ntelos, Inc. (www.ntelos.com). ++ */ ++ ++#include "dhcpd.h" ++ ++#if defined(LDAP_CONFIGURATION) ++ ++static LDAP * ld = NULL; ++static char *ldap_server = NULL, ++ *ldap_username = NULL, ++ *ldap_password = NULL, ++ *ldap_base_dn = NULL; ++static int ldap_method = LDAP_METHOD_DYNAMIC, ++ disable_ldap = 0; ++static struct ldap_config_stack *ldap_stack = NULL; ++ ++ ++static void ++ldap_parse_class (struct ldap_config_stack *item, struct parse *cfile) ++{ ++ struct berval **temp; ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "cn")) == NULL || ++ temp[0]->bv_val == NULL) ++ { ++ if (temp != NULL) ++ ldap_value_free_len (temp); ++ ++ return; ++ } ++ ++ strncat (cfile->inbuf, "class \"", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, temp[0]->bv_val, LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, "\" {\n", LDAP_BUFFER_SIZE); ++ ++ item->close_brace = 1; ++ ldap_value_free_len (temp); ++} ++ ++ ++static void ++ldap_parse_subclass (struct ldap_config_stack *item, struct parse *cfile) ++{ ++ struct berval **temp, **classdata; ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "cn")) == NULL || ++ temp[0]->bv_val == NULL) ++ { ++ if (temp != NULL) ++ ldap_value_free_len (temp); ++ ++ return; ++ } ++ ++ ++ if ((classdata = ldap_get_values_len (ld, item->ldent, ++ "dhcpClassData")) == NULL || ++ classdata[0]->bv_val == NULL) ++ { ++ if (classdata != NULL) ++ ldap_value_free_len (classdata); ++ ldap_value_free_len (temp); ++ ++ return; ++ } ++ ++ strncat (cfile->inbuf, "subclass ", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, (*classdata)->bv_val, LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, (*temp)->bv_val, LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, " {\n", LDAP_BUFFER_SIZE); ++ ++ item->close_brace = 1; ++ ldap_value_free_len (temp); ++ ldap_value_free_len (classdata); ++} ++ ++ ++static void ++ldap_parse_host (struct ldap_config_stack *item, struct parse *cfile) ++{ ++ struct berval **temp, **hwaddr; ++ ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "cn")) == NULL || ++ temp[0]->bv_val == NULL) ++ { ++ if (temp != NULL) ++ ldap_value_free_len (temp); ++ ++ return; ++ } ++ ++ if ((hwaddr = ldap_get_values_len (ld, item->ldent, ++ "dhcpHWAddress")) == NULL || ++ hwaddr[0]->bv_val == NULL) ++ { ++ if (hwaddr != NULL) ++ ldap_value_free_len (hwaddr); ++ ldap_value_free_len (temp); ++ ++ return; ++ } ++ ++ strncat (cfile->inbuf, "host ", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, (*temp)->bv_val, LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, " {\nhardware ", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, (*hwaddr)->bv_val, LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE); ++ ++ item->close_brace = 1; ++ ldap_value_free_len (temp); ++ ldap_value_free_len (hwaddr); ++} ++ ++ ++static void ++ldap_parse_shared_network (struct ldap_config_stack *item, struct parse *cfile) ++{ ++ struct berval **temp; ++ ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "cn")) == NULL || ++ temp[0]->bv_val == NULL) ++ { ++ if (temp != NULL) ++ ldap_value_free_len (temp); ++ ++ return; ++ } ++ ++ strncat (cfile->inbuf, "shared-network ", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, (*temp)->bv_val, LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, " {\n", LDAP_BUFFER_SIZE); ++ ++ item->close_brace = 1; ++ ldap_value_free_len (temp); ++} ++ ++ ++static void ++parse_netmask (int netmask, char *netmaskbuf) ++{ ++ unsigned long nm; ++ int i; ++ ++ nm = 0; ++ for (i=1; i <= netmask; i++) ++ { ++ nm |= 1 << (32 - i); ++ } ++ ++ sprintf (netmaskbuf, "%d.%d.%d.%d", (int) (nm >> 24) & 0xff, ++ (int) (nm >> 16) & 0xff, ++ (int) (nm >> 8) & 0xff, ++ (int) nm & 0xff); ++} ++ ++static void ++ldap_parse_subnet (struct ldap_config_stack *item, struct parse *cfile) ++{ ++ struct berval **temp, **netmask; ++ char netmaskbuf[16]; ++ int i; ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "cn")) == NULL || ++ temp[0]->bv_val == NULL) ++ { ++ if (temp != NULL) ++ ldap_value_free_len (temp); ++ ++ return; ++ } ++ ++ if ((netmask = ldap_get_values_len (ld, item->ldent, ++ "dhcpNetmask")) == NULL || ++ netmask[0]->bv_val == NULL) ++ { ++ if (netmask != NULL) ++ ldap_value_free_len (netmask); ++ ldap_value_free_len (temp); ++ ++ return; ++ } ++ ++ strncat (cfile->inbuf, "subnet ", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, temp[0]->bv_val, LDAP_BUFFER_SIZE); ++ ++ strncat (cfile->inbuf, " netmask ", LDAP_BUFFER_SIZE); ++ parse_netmask (strtol (netmask[0]->bv_val, NULL, 10), netmaskbuf); ++ strncat (cfile->inbuf, netmaskbuf, LDAP_BUFFER_SIZE); ++ ++ strncat (cfile->inbuf, " {\n", LDAP_BUFFER_SIZE); ++ ++ ldap_value_free_len (temp); ++ ldap_value_free_len (netmask); ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL) ++ { ++ strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE); ++ for (i=0; temp[i]->bv_val != NULL; i++) ++ { ++ strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE); ++ } ++ strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE); ++ ldap_value_free_len (temp); ++ } ++ ++ item->close_brace = 1; ++} ++ ++ ++static void ++ldap_parse_pool (struct ldap_config_stack *item, struct parse *cfile) ++{ ++ struct berval **temp; ++ int i; ++ ++ strncat (cfile->inbuf, "pool {\n", LDAP_BUFFER_SIZE); ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL) ++ { ++ strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE); ++ for (i=0; temp[i]->bv_val != NULL; i++) ++ { ++ strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE); ++ } ++ strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE); ++ ldap_value_free_len (temp); ++ } ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpPermitList")) != NULL) ++ { ++ for (i=0; temp[i]->bv_val != NULL; i++) ++ { ++ strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE); ++ } ++ ldap_value_free_len (temp); ++ } ++ ++ item->close_brace = 1; ++} ++ ++ ++static void ++ldap_parse_group (struct ldap_config_stack *item, struct parse *cfile) ++{ ++ strncat (cfile->inbuf, "group {\n", LDAP_BUFFER_SIZE); ++ item->close_brace = 1; ++} ++ ++ ++static void ++parse_external_dns (LDAPMessage * ent) ++{ ++ char *search[] = {"dhcpOptionsDN", "dhcpSharedNetworkDN", "dhcpSubnetDN", ++ "dhcpGroupDN", "dhcpHostDN", "dhcpClassesDN", ++ "dhcpPoolDN", NULL}; ++ LDAPMessage * newres, * newent; ++ struct ldap_config_stack *ns; ++ struct berval **temp; ++ int i, ret; ++ ++ for (i=0; search[i] != NULL; i++) ++ { ++ if ((ldap_method = LDAP_METHOD_DYNAMIC) && ++ (strcmp (search[i], "dhcpHostDN") == 0)) ++ continue; ++ ++ if ((temp = ldap_get_values_len (ld, ent, search[i])) == NULL) ++ continue; ++ ++ if ((ret = ldap_search_ext_s (ld, temp[0]->bv_val, LDAP_SCOPE_BASE, ++ "objectClass=*", NULL, 0, ++ NULL, NULL, NULL, 0, ++ &newres)) != LDAP_SUCCESS) ++ { ++ ldap_value_free_len (temp); ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ return; ++ } ++ ++ ldap_value_free_len (temp); ++ ++ newent = ldap_first_entry (ld, newres); ++ if (newent == NULL) ++ { ++ ldap_msgfree (newres); ++ continue; ++ } ++ ++#if defined(DEBUG_LDAP) ++ log_info ("Adding LDAP entry '%s' as child", ldap_get_dn (ld, newent)); ++#endif ++ ++ ns = dmalloc (sizeof (*ns), MDL); ++ ns->res = newres; ++ ns->ldent = newent; ++ ns->close_brace = 0; ++ ns->processed = 0; ++ ns->children = NULL; ++ ns->next = ldap_stack->children; ++ ldap_stack->children = ns; ++ } ++} ++ ++ ++static void ++ldap_generate_config_string (struct ldap_config_stack *item, struct parse *cfile) ++{ ++ struct berval **objectClass, **temp; ++ int i, j, ignore, found; ++ ++ if ((objectClass = ldap_get_values_len (ld, item->ldent, ++ "objectClass")) == NULL) ++ return; ++ ++ ignore = 0; ++ found = 1; ++ for (i=0; objectClass[i]->bv_val != NULL; i++) ++ { ++ if (strcmp (objectClass[i]->bv_val, "dhcpSharedNetwork") == 0) ++ ldap_parse_shared_network (item, cfile); ++ else if (strcmp (objectClass[i]->bv_val, "dhcpClass") == 0) ++ ldap_parse_class (item, cfile); ++ else if (strcmp (objectClass[i]->bv_val, "dhcpSubnet") == 0) ++ ldap_parse_subnet (item, cfile); ++ else if (strcmp (objectClass[i]->bv_val, "dhcpPool") == 0) ++ ldap_parse_pool (item, cfile); ++ else if (strcmp (objectClass[i]->bv_val, "dhcpGroup") == 0) ++ ldap_parse_group (item, cfile); ++ else if (strcmp (objectClass[i]->bv_val, "dhcpHost") == 0) ++ { ++ if (ldap_method == LDAP_METHOD_STATIC) ++ ldap_parse_host (item, cfile); ++ else ++ { ++ ignore = 1; ++ break; ++ } ++ } ++ else if (strcmp (objectClass[i]->bv_val, "dhcpSubClass") == 0) ++ { ++ if (ldap_method == LDAP_METHOD_STATIC) ++ ldap_parse_subclass (item, cfile); ++ else ++ { ++ ignore = 1; ++ break; ++ } ++ } ++ else ++ found = 0; ++ ++ if (found && cfile->inbuf[0] == '\0') ++ { ++ ignore = 1; ++ break; ++ } ++ } ++ ++ ldap_value_free_len (objectClass); ++ ++ if (ignore) ++ return; ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpOption")) != NULL) ++ { ++ for (j=0; temp[j]->bv_val != NULL; j++) ++ { ++ strncat (cfile->inbuf, "option ", LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE); ++ } ++ ldap_value_free_len (temp); ++ } ++ ++ if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpStatements")) != NULL) ++ { ++ for (j=0; temp[j]->bv_val != NULL; j++) ++ { ++ strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE); ++ strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE); ++ } ++ ldap_value_free_len (temp); ++ } ++ ++ parse_external_dns (item->ldent); ++} ++ ++ ++static void ++free_stack_entry (struct ldap_config_stack *item) ++{ ++ ldap_msgfree (item->res); ++ dfree (item, MDL); ++} ++ ++ ++static void ++next_ldap_entry (struct parse *cfile) ++{ ++ struct ldap_config_stack *temp_stack; ++ ++ if (ldap_stack->processed && ldap_stack->children != NULL) ++ { ++ temp_stack = ldap_stack->children; ++ if (temp_stack->close_brace) ++ strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE); ++ ++ ldap_stack->children = ldap_stack->children->next; ++ free_stack_entry (temp_stack); ++ ++ if (ldap_stack->processed && ldap_stack->children != NULL) ++ return; ++ } ++ ++ if (ldap_stack->close_brace) ++ { ++ strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE); ++ ldap_stack->close_brace = 0; ++ } ++ ++ while (ldap_stack != NULL && ldap_stack->children == NULL && ++ (ldap_stack->ldent = ldap_next_entry (ld, ldap_stack->ldent)) == NULL) ++ { ++ if (ldap_stack->close_brace) ++ { ++ strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE); ++ ldap_stack->close_brace = 0; ++ } ++ ++ temp_stack = ldap_stack; ++ ldap_stack = ldap_stack->next; ++ free_stack_entry (temp_stack); ++ } ++ ++ if (ldap_stack != NULL && ldap_stack->children == NULL && ++ ldap_stack->close_brace) ++ { ++ strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE); ++ ldap_stack->close_brace = 0; ++ } ++} ++ ++ ++static void ++add_to_config_stack (LDAPMessage * res, LDAPMessage * ent) ++{ ++ struct ldap_config_stack *ns; ++ ++ ns = dmalloc (sizeof (*ns), MDL); ++ ns->res = res; ++ ns->ldent = ent; ++ ns->close_brace = 0; ++ ns->processed = 0; ++ ns->children = NULL; ++ ns->next = ldap_stack; ++ ldap_stack = ns; ++} ++ ++ ++static void ++ldap_start (void) ++{ ++ struct option_state *options; ++ struct option_cache *oc; ++ struct data_string db; ++ int ret; ++ ++ if (ld != NULL) ++ return; ++ ++ if (ldap_server == NULL) ++ { ++ options = NULL; ++ option_state_allocate (&options, MDL); ++ ++ execute_statements_in_scope ((struct binding_value **) NULL, ++ (struct packet *) NULL, (struct lease *) NULL, ++ (struct client_state *) NULL, (struct option_state *) NULL, ++ options, &global_scope, root_group, (struct group *) NULL); ++ ++ memset (&db, 0, sizeof (db)); ++ oc = lookup_option (&server_universe, options, SV_LDAP_SERVER); ++ if (oc && ++ evaluate_option_cache (&db, (struct packet*) NULL, ++ (struct lease *) NULL, (struct client_state *) NULL, ++ options, (struct option_state *) NULL, &global_scope, oc, MDL)) ++ { ++ ldap_server = dmalloc (db.len + 1, MDL); ++ if (!ldap_server) ++ log_fatal ("no memory for ldap server"); ++ memcpy (ldap_server, db.data, db.len); ++ ldap_server[db.len] = 0; ++ data_string_forget (&db, MDL); ++ } ++ ++ oc = lookup_option (&server_universe, options, SV_LDAP_USERNAME); ++ if (oc && ++ evaluate_option_cache (&db, (struct packet*) NULL, ++ (struct lease *) NULL, (struct client_state *) NULL, ++ options, (struct option_state *) NULL, &global_scope, oc, MDL)) ++ { ++ ldap_username = dmalloc (db.len + 1, MDL); ++ if (!ldap_username) ++ log_fatal ("no memory for ldap username"); ++ memcpy (ldap_username, db.data, db.len); ++ ldap_username[db.len] = 0; ++ data_string_forget (&db, MDL); ++ } ++ ++ oc = lookup_option (&server_universe, options, SV_LDAP_PASSWORD); ++ if (oc && ++ evaluate_option_cache (&db, (struct packet*) NULL, ++ (struct lease *) NULL, (struct client_state *) NULL, ++ options, (struct option_state *) NULL, &global_scope, oc, MDL)) ++ { ++ ldap_password = dmalloc (db.len + 1, MDL); ++ if (!ldap_password) ++ log_fatal ("no memory for ldap password"); ++ memcpy (ldap_password, db.data, db.len); ++ ldap_password[db.len] = 0; ++ data_string_forget (&db, MDL); ++ } ++ ++ oc = lookup_option (&server_universe, options, SV_LDAP_BASE_DN); ++ if (oc && ++ evaluate_option_cache (&db, (struct packet*) NULL, ++ (struct lease *) NULL, (struct client_state *) NULL, ++ options, (struct option_state *) NULL, &global_scope, oc, MDL)) ++ { ++ ldap_base_dn = dmalloc (db.len + 1, MDL); ++ if (!ldap_base_dn) ++ log_fatal ("no memory for ldap password"); ++ memcpy (ldap_base_dn, db.data, db.len); ++ ldap_base_dn[db.len] = 0; ++ data_string_forget (&db, MDL); ++ } ++ ++ oc = lookup_option (&server_universe, options, SV_LDAP_METHOD); ++ if (oc && ++ evaluate_option_cache (&db, (struct packet*) NULL, ++ (struct lease *) NULL, (struct client_state *) NULL, ++ options, (struct option_state *) NULL, &global_scope, oc, MDL)) ++ { ++ ++ if (db.len == 1) ++ ldap_method = db.data [0]; ++ else ++ log_fatal ("invalid dns update type"); ++ data_string_forget (&db, MDL); ++ } ++ ++ option_state_dereference (&options, MDL); ++ } ++ ++ if (ldap_server == NULL || ldap_username == NULL || ldap_password == NULL || ++ ldap_base_dn == NULL) ++ { ++ log_info ("Not searching LDAP since ldap-server, ldap-port, ldap-username, ldap-password and ldap-baes-dn were not specified in the config file"); ++ disable_ldap = 1; ++ return; ++ } ++ ++#if defined (DEBUG_LDAP) ++ log_info ("Connecting to LDAP server ldap://%s", ldap_server); ++#endif ++ ++ char *tmpserver = NULL; ++ if ((tmpserver = malloc(strlen(ldap_server) + 8)) == NULL) ++ { ++ log_error ("Cannot init tmpldapserver string to ldap://%s", ldap_server); ++ disable_ldap = 1; ++ return; ++ } ++ ++ if (sprintf(tmpserver, "ldap://%s", ldap_server) == -1) ++ { ++ log_error ("Cannot init tmpldapserver via sprintf()"); ++ disable_ldap = 1; ++ return; ++ } ++ ++ ldap_initialize (&ld, tmpserver); ++ if (ld == NULL) ++ { ++ log_error ("Cannot init ldap session to %s", ldap_server); ++ disable_ldap = 1; ++ return; ++ } ++ ++ free (tmpserver); ++ ++ struct berval cred; ++ cred.bv_val = strdup(ldap_password); ++ cred.bv_len = strlen(ldap_password); ++ ret = ldap_sasl_bind_s (ld, ldap_username, LDAP_SASL_SIMPLE, ++ &cred, NULL,NULL, NULL); ++ if (ret != LDAP_SUCCESS) ++ { ++ log_error ("Error: Cannot log into ldap server %s: %s", ldap_server, ++ ldap_err2string (ret)); ++ disable_ldap = 1; ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ return; ++ } ++ ++#if defined (DEBUG_LDAP) ++ log_info ("Successfully logged into LDAP server %s", ldap_server); ++#endif ++} ++ ++ ++static int ++ldap_read_function (struct parse *cfile) ++{ ++ char *dn, eofstring[2] = {EOF, '\0'}; ++ struct ldap_config_stack *curentry; ++ LDAPMessage * ent, * res; ++ int ret; ++ ++ cfile->inbuf[0] = '\0'; ++ cfile->buflen = 0; ++ while (1) ++ { ++ if (ldap_stack == NULL) ++ { ++ strncat (cfile->inbuf, eofstring, LDAP_BUFFER_SIZE); ++ cfile->buflen = strlen (cfile->inbuf); ++ cfile->bufix = 1; ++ return (cfile->inbuf[0]); ++ } ++ ++ if (ldap_stack->processed && ldap_stack->children != NULL) ++ curentry = ldap_stack->children; ++ else ++ curentry = ldap_stack; ++ ++ dn = ldap_get_dn (ld, curentry->ldent); ++#if defined(DEBUG_LDAP) ++ log_info ("Found LDAP entry '%s'", dn); ++#endif ++ ++ ldap_generate_config_string (curentry, cfile); ++ if (strlen (cfile->inbuf) == 0) ++ { ++#if defined(DEBUG_LDAP) ++ log_info ("Skipping LDAP entry '%s'", dn); ++#endif ++ ldap_memfree (dn); ++ dn = NULL; ++ next_ldap_entry (cfile); ++ continue; ++ } ++ ++ curentry->processed = 1; ++ break; ++ } ++ ++ if (ld == NULL) ++ ldap_start (); ++ ++ if (ld == NULL) ++ { ++ strncat (cfile->inbuf, eofstring, LDAP_BUFFER_SIZE); ++ cfile->buflen = strlen (cfile->inbuf); ++ cfile->bufix = 1; ++ return (cfile->inbuf[0]); ++ } ++ ++ if ((ret = ldap_search_ext_s (ld, dn, LDAP_SCOPE_ONELEVEL, "objectClass=*", ++ NULL, 0, NULL, NULL, NULL, 0, ++ &res)) != LDAP_SUCCESS) ++ { ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ ++ strncat (cfile->inbuf, eofstring, LDAP_BUFFER_SIZE); ++ cfile->buflen = strlen (cfile->inbuf); ++ cfile->bufix = 1; ++ return (cfile->inbuf[0]); ++ } ++ ++ ldap_memfree (dn); ++ ++ ent = ldap_first_entry (ld, res); ++ if (ent != NULL) ++ add_to_config_stack (res, ent); ++ else ++ { ++ ldap_msgfree (res); ++ next_ldap_entry (cfile); ++ } ++ ++#if defined (DEBUG_LDAP) ++ log_info ("Sending config line '%s'", cfile->inbuf); ++#endif ++ ++ cfile->buflen = strlen (cfile->inbuf); ++ cfile->bufix = 1; ++ return (cfile->inbuf[0]); ++} ++ ++ ++static char * ++ldap_get_host_name (LDAPMessage * ent) ++{ ++ struct berval **name; ++ char *ret; ++ ++ ret = NULL; ++ if ((name = ldap_get_values_len (ld, ent, "cn")) == NULL || name[0] == NULL) ++ { ++ if (name != NULL) ++ ldap_value_free_len (name); ++ ++#if defined (DEBUG_LDAP) ++ log_info ("Cannot get cn attribute for LDAP entry %s", ++ ldap_get_dn (ld, ent)); ++#endif ++ return (NULL); ++ } ++ ++ ret = dmalloc (strlen (name[0]->bv_val) + 1, MDL); ++ strcpy (ret, name[0]->bv_val); ++ ldap_value_free_len (name); ++ ++ return (ret); ++} ++ ++ ++isc_result_t ++ldap_read_config (void) ++{ ++ struct berval **temp; ++ char *buffer, dn[256]; ++ LDAPMessage * ldres, * ent; ++ struct parse *cfile; ++ struct utsname unme; ++ isc_result_t res; ++ int ret; ++ ++ ++ buffer = dmalloc (LDAP_BUFFER_SIZE, MDL); ++ cfile = (struct parse *) NULL; ++ res = new_parse (&cfile, -1, buffer, LDAP_BUFFER_SIZE, "LDAP", 0); ++ if (res != ISC_R_SUCCESS) ++ return (res); ++ ++ cfile->bufix = cfile->buflen = 0; ++ cfile->read_function = ldap_read_function; ++ ++ if (ld == NULL) ++ ldap_start (); ++ if (ld == NULL) ++ return (ldap_server == NULL ? ISC_R_SUCCESS : ISC_R_FAILURE); ++ ++ uname (&unme); ++ snprintf (dn, sizeof (dn), "(&(objectClass=dhcpServer)(cn=%s))", ++ unme.nodename); ++ ++ if ((ret = ldap_search_ext_s (ld, ldap_base_dn, LDAP_SCOPE_SUBTREE, dn, NULL, ++ 0, NULL, NULL, NULL, 0, &ldres)) != LDAP_SUCCESS) ++ { ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ log_error ("Cannot search LDAP for %s: %s", dn, ldap_err2string (ret)); ++ return (ISC_R_FAILURE); ++ } ++ ++ if ((ent = ldap_first_entry (ld, ldres)) == NULL) ++ { ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ log_error ("Error: Cannot find LDAP entry matching %s", dn); ++ return (ISC_R_FAILURE); ++ } ++ ++#if defined(DEBUG_LDAP) ++ buffer = ldap_get_dn (ld, ent); ++ log_info ("Found LDAP entry '%s'", buffer); ++ ldap_memfree (buffer); ++#endif ++ ++ if ((temp = ldap_get_values_len (ld, ent, "dhcpServiceDN")) == NULL || ++ temp[0]->bv_val == NULL) ++ { ++ if (temp != NULL) ++ ldap_value_free_len (temp); ++ ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ log_error ("Error: Cannot find LDAP entry matching %s", dn); ++ return (ISC_R_FAILURE); ++ } ++ ++ ldap_msgfree (ldres); ++ ++ if ((ret = ldap_search_ext_s (ld, temp[0]->bv_val, LDAP_SCOPE_BASE, ++ "objectClass=*", NULL, 0, ++ NULL, NULL, NULL, 0, &ldres)) != LDAP_SUCCESS) ++ { ++ ldap_value_free_len (temp); ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ log_error ("Cannot search LDAP for %s: %s", temp[0]->bv_val, ++ ldap_err2string (ret)); ++ return (ISC_R_FAILURE); ++ } ++ ++ if ((ent = ldap_first_entry (ld, ldres)) == NULL) ++ { ++ ldap_value_free_len (temp); ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ log_error ("Error: Cannot find LDAP entry matching %s", temp[0]->bv_val); ++ return (ISC_R_FAILURE); ++ } ++ ++ ldap_value_free_len (temp); ++ ++ add_to_config_stack (ldres, ent); ++ ++ res = conf_file_subparse (cfile, root_group, ROOT_GROUP); ++ end_parse (&cfile); ++ ++ return (res); ++} ++ ++ ++/* This function will parse the dhcpOption and dhcpStatements field in the LDAP ++ entry if it exists. Right now, type will be either HOST_DECL or CLASS_DECL. ++ If we are parsing a HOST_DECL, this always returns 0. If we are parsing a ++ CLASS_DECL, this will return what the current lease limit is in LDAP. If ++ there is no lease limit specified, we return 0 */ ++ ++static int ++ldap_parse_options (LDAPMessage * ent, struct group *group, ++ int type, struct host_decl *host, ++ struct class **class) ++{ ++ struct berval **temp; ++ char option_buffer[8192]; ++ int i, declaration, lease_limit; ++ enum dhcp_token token; ++ struct parse *cfile; ++ isc_result_t res; ++ const char *val; ++ ++ lease_limit = 0; ++ *option_buffer = '\0'; ++ if ((temp = ldap_get_values_len (ld, ent, "dhcpStatements")) != NULL) ++ { ++ for (i=0; temp[i]->bv_val != NULL; i++) ++ { ++ if (strncasecmp ("lease limit ", temp[i]->bv_val, 12) == 0) ++ { ++ lease_limit = strtol ((temp[i]->bv_val) + 12, NULL, 10); ++ continue; ++ } ++ ++ strncat (option_buffer, temp[i]->bv_val, sizeof (option_buffer) - strlen (option_buffer) - 1); ++ strncat (option_buffer, ";\n", sizeof (option_buffer) - strlen (option_buffer) - 1); ++ } ++ ldap_value_free_len (temp); ++ } ++ ++ if ((temp = ldap_get_values_len (ld, ent, "dhcpOption")) != NULL) ++ { ++ for (i=0; temp[i]->bv_val != NULL; i++) ++ { ++ strncat (option_buffer, "option ", sizeof (option_buffer) - strlen (option_buffer) - 1); ++ strncat (option_buffer, temp[i]->bv_val, sizeof (option_buffer) - strlen (option_buffer) - 1); ++ strncat (option_buffer, ";\n", sizeof (option_buffer) - strlen (option_buffer) - 1); ++ } ++ ldap_value_free_len (temp); ++ } ++ ++ if (*option_buffer == '\0') ++ return (lease_limit); ++ ++ cfile = (struct parse *) NULL; ++ res = new_parse (&cfile, -1, option_buffer, strlen (option_buffer), ++ type == HOST_DECL ? "LDAP-HOST" : "LDAP-SUBCLASS", 0); ++ if (res != ISC_R_SUCCESS) ++ return (lease_limit); ++ ++#if defined (DEBUG_LDAP) ++ log_info ("Sending the following options: '%s'", option_buffer); ++#endif ++ ++ declaration = 0; ++ do { ++ token = peek_token (&val, NULL, cfile); ++ if (token == END_OF_FILE) ++ break; ++ declaration = parse_statement (cfile, group, type, host, declaration); ++ } while (1); ++ ++ end_parse (&cfile); ++ ++ return (lease_limit); ++} ++ ++ ++ ++int ++find_haddr_in_ldap (struct host_decl **hp, int htype, unsigned hlen, ++ const unsigned char *haddr, const char *file, int line) ++{ ++ char buf[60], *type_str; ++ LDAPMessage * res, *ent; ++ struct host_decl * host; ++ isc_result_t status; ++ int ret; ++ ++ if (disable_ldap || ldap_method == LDAP_METHOD_STATIC) ++ return (0); ++ ++ if (ld == NULL) ++ ldap_start (); ++ if (ld == NULL) ++ return (0); ++ ++ switch (htype) ++ { ++ case HTYPE_ETHER: ++ type_str = "ethernet"; ++ break; ++ case HTYPE_IEEE802: ++ type_str = "token-ring"; ++ break; ++ case HTYPE_FDDI: ++ type_str = "fddi"; ++ break; ++ default: ++ log_info ("Ignoring unknown type %d", htype); ++ return (0); ++ } ++ ++ snprintf (buf, sizeof (buf), "dhcpHWAddress=%s %s", type_str, ++ print_hw_addr (htype, hlen, haddr)); ++#if defined (DEBUG_LDAP) ++ log_info ("Searching for %s in LDAP tree %s", buf, ldap_base_dn); ++#endif ++ ++ if ((ret = ldap_search_ext_s (ld, ldap_base_dn, LDAP_SCOPE_SUBTREE, ++ buf, NULL, 0, NULL, NULL, NULL, 0, ++ &res)) != LDAP_SUCCESS) ++ { ++ if (ret != LDAP_NO_SUCH_OBJECT) ++ { ++ log_error ("Cannot search for %s in LDAP tree %s: %s", buf, ++ ldap_base_dn, ldap_err2string (ret)); ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ } ++#if defined (DEBUG_LDAP) ++ else ++ log_info ("ldap_search_ext_s returned %s when searching for %s in %s", ++ ldap_err2string (ret), buf, ldap_base_dn); ++#endif ++ ++ return (0); ++ } ++ ++ if ((ent = ldap_first_entry (ld, res)) != NULL) ++ { ++#if defined (DEBUG_LDAP) ++ log_info ("Found LDAP entry %s", ldap_get_dn (ld, ent)); ++#endif ++ ++ host = (struct host_decl *)0; ++ status = host_allocate (&host, MDL); ++ if (status != ISC_R_SUCCESS) ++ { ++ log_fatal ("can't allocate host decl struct: %s", ++ isc_result_totext (status)); ++ return (0); ++ } ++ ++ host->name = ldap_get_host_name (ent); ++ if (host->name == NULL) ++ { ++ host_dereference (&host, MDL); ++ ldap_msgfree (res); ++ return (0); ++ } ++ ++ if (!clone_group (&host->group, root_group, MDL)) ++ { ++ log_fatal ("can't clone group for host %s", host->name); ++ host_dereference (&host, MDL); ++ return (0); ++ } ++ ++ ldap_parse_options (ent, host->group, HOST_DECL, host, NULL); ++ ++ *hp = host; ++ ldap_msgfree (res); ++ return (1); ++ } ++ ++ ++ ldap_msgfree (res); ++ return (0); ++} ++ ++ ++int ++find_subclass_in_ldap (struct class *class, struct class **newclass, ++ struct data_string *data) ++{ ++ LDAPMessage * res, * ent; ++ int ret, lease_limit; ++ isc_result_t status; ++ char buf[1024]; ++ ++ if (disable_ldap || ldap_method == LDAP_METHOD_STATIC) ++ return (0); ++ ++ if (ld == NULL) ++ ldap_start (); ++ if (ld == NULL) ++ return (0); ++ ++ snprintf (buf, sizeof (buf), "(&(objectClass=dhcpSubClass)(cn=%s)(dhcpClassData=%s))", print_hex_1 (data->len, data->data, 60), print_hex_2 (strlen (class->name), (const u_int8_t *) class->name, 60)); ++#if defined (DEBUG_LDAP) ++ log_info ("Searching LDAP for %s", buf); ++#endif ++ ++ if ((ret = ldap_search_ext_s (ld, ldap_base_dn, LDAP_SCOPE_SUBTREE, ++ buf, NULL, 0, NULL, NULL, NULL, 0, ++ &res)) != LDAP_SUCCESS) ++ { ++ if (ret != LDAP_NO_SUCH_OBJECT) ++ { ++ log_error ("Cannot search for %s in LDAP tree %s: %s", buf, ++ ldap_base_dn, ldap_err2string (ret)); ++ ldap_unbind_ext (ld, NULL, NULL); ++ ld = NULL; ++ } ++#if defined (DEBUG_LDAP) ++ else ++ log_info ("ldap_search_ext_s returned %s when searching for %s in %s", ++ ldap_err2string (ret), buf, ldap_base_dn); ++#endif ++ ++ return (0); ++ } ++ ++ if ((ent = ldap_first_entry (ld, res)) != NULL) ++ { ++#if defined (DEBUG_LDAP) ++ log_info ("Found LDAP entry %s", ldap_get_dn (ld, ent)); ++#endif ++ ++ status = class_allocate (newclass, MDL); ++ if (status != ISC_R_SUCCESS) ++ { ++ log_error ("Cannot allocate memory for a new class"); ++ return (0); ++ } ++ ++ group_reference (&(*newclass)->group, class->group, MDL); ++ class_reference (&(*newclass)->superclass, class, MDL); ++ lease_limit = ldap_parse_options (ent, (*newclass)->group, ++ CLASS_DECL, NULL, newclass); ++ if (lease_limit == 0) ++ (*newclass)->lease_limit = class->lease_limit; ++ else ++ class->lease_limit = lease_limit; ++ ++ if ((*newclass)->lease_limit) ++ { ++ (*newclass)->billed_leases = ++ dmalloc ((*newclass)->lease_limit * sizeof (struct lease *), MDL); ++ if (!(*newclass)->billed_leases) ++ { ++ log_error ("no memory for billing"); ++ class_dereference (newclass, MDL); ++ return (0); ++ } ++ memset ((*newclass)->billed_leases, 0, ++ ((*newclass)->lease_limit * sizeof (*newclass)->billed_leases)); ++ } ++ ++ data_string_copy (&(*newclass)->hash_string, data, MDL); ++ ++ ldap_msgfree (res); ++ return (1); ++ } ++ ++ ++ ldap_msgfree (res); ++ return (0); ++} ++ ++#endif ++ +--- dhcp-3.0.5/server/mdb.c.ldapconf 2007-03-04 15:32:24.000000000 -0500 ++++ dhcp-3.0.5/server/mdb.c 2007-03-04 15:32:24.000000000 -0500 +@@ -373,6 +373,12 @@ + const char *file, int line) + { + struct hardware h; ++ int ret; ++ ++#if defined(LDAP_CONFIGURATION) ++ if ((ret = find_haddr_in_ldap (hp, htype, hlen, haddr, file, line))) ++ return ret; ++#endif + + h.hlen = hlen + 1; + h.hbuf [0] = htype; +--- dhcp-3.0.5/server/stables.c.ldapconf 2004-06-10 13:59:58.000000000 -0400 ++++ dhcp-3.0.5/server/stables.c 2007-03-04 15:32:24.000000000 -0500 +@@ -483,12 +483,21 @@ + { "log-facility", "Nsyslog-facilities.", &server_universe, 44 }, + { "do-forward-updates", "f", &server_universe, 45 }, + { "ping-timeout", "T", &server_universe, 46 }, ++#if defined(LDAP_CONFIGURATION) ++ { "ldap-server", "t", &server_universe, 47 }, ++ { "ldap-port", "d", &server_universe, 48 }, ++ { "ldap-username", "t", &server_universe, 49 }, ++ { "ldap-password", "t", &server_universe, 50 }, ++ { "ldap-base-dn", "t", &server_universe, 51 }, ++ { "ldap-method", "Nldap-methods.", &server_universe, 52 }, ++#else + { "unknown-47", "X", &server_universe, 47 }, + { "unknown-48", "X", &server_universe, 48 }, + { "unknown-49", "X", &server_universe, 49 }, + { "unknown-50", "X", &server_universe, 50 }, + { "unknown-51", "X", &server_universe, 51 }, + { "unknown-52", "X", &server_universe, 52 }, ++#endif + { "unknown-53", "X", &server_universe, 53 }, + { "unknown-54", "X", &server_universe, 54 }, + { "unknown-55", "X", &server_universe, 55 }, +@@ -694,6 +703,20 @@ + { "option-end", "e", &server_universe, 255 }, + }; + ++#if defined(LDAP_CONFIGURATION) ++struct enumeration_value ldap_values [] = { ++ { "static", LDAP_METHOD_STATIC }, ++ { "dynamic", LDAP_METHOD_DYNAMIC }, ++ { (char *) 0, 0 } ++}; ++ ++struct enumeration ldap_methods = { ++ (struct enumeration *)0, ++ "ldap-methods", ++ ldap_values ++}; ++#endif ++ + struct enumeration_value ddns_styles_values [] = { + { "none", 0 }, + { "ad-hoc", 1 }, Index: dhcpd-conf-to-ldap.pl =================================================================== RCS file: dhcpd-conf-to-ldap.pl diff -N dhcpd-conf-to-ldap.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ dhcpd-conf-to-ldap.pl 5 Mar 2007 22:51:29 -0000 1.3 @@ -0,0 +1,517 @@ +#!/usr/bin/perl -w + +# Brian Masney +# To use this script, set your base DN below. Then run +# ./dhcpd-conf-to-ldap.pl < /path-to-dhcpd-conf/dhcpd.conf > output-file +# The output of this script will generate entries in LDIF format. You can use +# the slapadd command to add these entries into your LDAP server. You will +# definately want to double check that your LDAP entries are correct before +# you load them into LDAP. + +# This script does not do much error checking. Make sure before you run this +# that the DHCP server doesn't give any errors about your config file + +use Sys::Hostname; + +my $basedn = "dc=ntelos, dc=net"; + +sub next_token +{ + local ($lowercase) = @_; + local ($token, $newline); + + do + { + if (!defined ($line) || length ($line) == 0) + { + $line = <>; + return undef if !defined ($line); + chop $line; + $line_number++; + $token_number = 0; + } + + $line =~ s/#.*//; + $line =~ s/^\s+//; + $line =~ s/\s+$//; + } + while (length ($line) == 0); + + if (($token, $newline) = $line =~ /^(.*?)\s+(.*)/) + { + $line = $newline; + } + else + { + $token = $line; + $line = ''; + } + $token_number++; + + $token =~ y/[A-Z]/[a-z]/ if $lowercase; + + return ($token); +} + + +sub remaining_line +{ + local ($tmp, $str); + + $str = ""; + while (($tmp = next_token (0))) + { + $str .= ' ' if !($str eq ""); + $str .= $tmp; + last if $tmp =~ /;\s*$/; + } + + $str =~ s/;$//; + return ($str); +} + + +sub +add_dn_to_stack +{ + local ($dn) = @_; + + $current_dn = "$dn, $current_dn"; +} + + +sub +remove_dn_from_stack +{ + $current_dn =~ s/^.*?,\s*//; +} + + +sub +parse_error +{ + print "Parse error on line number $line_number at token number $token_number\n"; + exit (1); +} + + +sub +print_entry +{ + return if (scalar keys %curentry == 0); + + if (!defined ($curentry{'type'})) + { + $host = hostname (); + $hostdn = "cn=$host, $basedn"; + print "dn: $hostdn\n"; + print "objectClass: top\n"; + print "objectClass: dhcpServer\n"; + print "cn: $host\n"; + print "dhcpServiceDN: $current_dn\n\n"; + + print "dn: $current_dn\n"; + print "cn: DHCP Config\n"; + print "objectClass: top\n"; + print "objectClass: dhcpService\n"; + if (defined ($curentry{'options'})) + { + print "objectClass: dhcpOptions\n"; + } + print "dhcpPrimaryDN: $hostdn\n"; + } + elsif ($curentry{'type'} eq 'subnet') + { + print "dn: $current_dn\n"; + print "cn: " . $curentry{'ip'} . "\n"; + print "objectClass: top\n"; + print "objectClass: dhcpSubnet\n"; + if (defined ($curentry{'options'})) + { + print "objectClass: dhcpOptions\n"; + } + + print "dhcpNetMask: " . $curentry{'netmask'} . "\n"; + if (defined ($curentry{'range'})) + { + print "dhcpRange: " . $curentry{'range'} . "\n"; + } + } + elsif ($curentry{'type'} eq 'shared-network') + { + print "dn: $current_dn\n"; + print "cn: " . $curentry{'descr'} . "\n"; + print "objectClass: top\n"; + print "objectClass: dhcpSharedNetwork\n"; + if (defined ($curentry{'options'})) + { + print "objectClass: dhcpOptions\n"; + } + } + elsif ($curentry{'type'} eq 'group') + { + print "dn: $current_dn\n"; + print "cn: group\n"; + print "objectClass: top\n"; + print "objectClass: dhcpGroup\n"; + if (defined ($curentry{'options'})) + { + print "objectClass: dhcpOptions\n"; + } + } + elsif ($curentry{'type'} eq 'host') + { + print "dn: $current_dn\n"; + print "cn: " . $curentry{'host'} . "\n"; + print "objectClass: top\n"; + print "objectClass: dhcpHost\n"; + if (defined ($curentry{'options'})) + { + print "objectClass: dhcpOptions\n"; + } + + if (defined ($curentry{'hwaddress'})) + { + print "dhcpHWAddress: " . $curentry{'hwaddress'} . "\n"; + } + } + elsif ($curentry{'type'} eq 'pool') + { + print "dn: $current_dn\n"; + print "cn: pool\n"; + print "objectClass: top\n"; + print "objectClass: dhcpPool\n"; + if (defined ($curentry{'options'})) + { + print "objectClass: dhcpOptions\n"; + } + + if (defined ($curentry{'range'})) + { + print "dhcpRange: " . $curentry{'range'} . "\n"; + } + } + elsif ($curentry{'type'} eq 'class') + { + print "dn: $current_dn\n"; + print "cn: " . $curentry{'class'} . "\n"; + print "objectClass: top\n"; + print "objectClass: dhcpClass\n"; + if (defined ($curentry{'options'})) + { + print "objectClass: dhcpOptions\n"; + } + } + elsif ($curentry{'type'} eq 'subclass') + { + print "dn: $current_dn\n"; + print "cn: " . $curentry{'subclass'} . "\n"; + print "objectClass: top\n"; + print "objectClass: dhcpSubClass\n"; + if (defined ($curentry{'options'})) + { + print "objectClass: dhcpOptions\n"; + } + print "dhcpClassData: " . $curentry{'class'} . "\n"; + } + + if (defined ($curentry{'statements'})) + { + foreach $statement (@{$curentry{'statements'}}) + { + print "dhcpStatements: $statement\n"; + } + } + + if (defined ($curentry{'options'})) + { + foreach $statement (@{$curentry{'options'}}) + { + print "dhcpOption: $statement\n"; + } + } + + print "\n"; + undef (%curentry); +} + + +sub parse_netmask +{ + local ($netmask) = @_; + local ($i); + + if ((($a, $b, $c, $d) = $netmask =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) != 4) + { + parse_error (); + } + + $num = (($a & 0xff) << 24) | + (($b & 0xff) << 16) | + (($c & 0xff) << 8) | + ($d & 0xff); + + for ($i=1; $i<=32 && $num & (1 << (32 - $i)); $i++) + { + } + $i--; + + return ($i); +} + + +sub parse_subnet +{ + local ($ip, $tmp, $netmask); + + print_entry () if %curentry; + + $ip = next_token (0); + parse_error () if !defined ($ip); + + $tmp = next_token (1); + parse_error () if !defined ($tmp); + parse_error () if !($tmp eq 'netmask'); + + $tmp = next_token (0); + parse_error () if !defined ($tmp); + $netmask = parse_netmask ($tmp); + + $tmp = next_token (0); + parse_error () if !defined ($tmp); + parse_error () if !($tmp eq '{'); + + add_dn_to_stack ("cn=$ip"); + $curentry{'type'} = 'subnet'; + $curentry{'ip'} = $ip; + $curentry{'netmask'} = $netmask; +} + + +sub parse_shared_network +{ + local ($descr, $tmp); + + print_entry () if %curentry; + + $descr = next_token (0); + parse_error () if !defined ($descr); + + $tmp = next_token (0); + parse_error () if !defined ($tmp); + parse_error () if !($tmp eq '{'); + + add_dn_to_stack ("cn=$descr"); + $curentry{'type'} = 'shared-network'; + $curentry{'descr'} = $descr; +} + + +sub parse_host +{ + local ($descr, $tmp); + + print_entry () if %curentry; + + $host = next_token (0); + parse_error () if !defined ($host); + + $tmp = next_token (0); + parse_error () if !defined ($tmp); + parse_error () if !($tmp eq '{'); + + add_dn_to_stack ("cn=$host"); + $curentry{'type'} = 'host'; + $curentry{'host'} = $host; +} + + +sub parse_group +{ + local ($descr, $tmp); + + print_entry () if %curentry; + + $tmp = next_token (0); + parse_error () if !defined ($tmp); + parse_error () if !($tmp eq '{'); + + add_dn_to_stack ("cn=group"); + $curentry{'type'} = 'group'; +} + + +sub parse_pool +{ + local ($descr, $tmp); + + print_entry () if %curentry; + + $tmp = next_token (0); + parse_error () if !defined ($tmp); + parse_error () if !($tmp eq '{'); + + add_dn_to_stack ("cn=pool"); + $curentry{'type'} = 'pool'; +} + + +sub parse_class +{ + local ($descr, $tmp); + + print_entry () if %curentry; + + $class = next_token (0); + parse_error () if !defined ($class); + + $tmp = next_token (0); + parse_error () if !defined ($tmp); + parse_error () if !($tmp eq '{'); + + $class =~ s/\"//g; + add_dn_to_stack ("cn=$class"); + $curentry{'type'} = 'class'; + $curentry{'class'} = $class; +} + + +sub parse_subclass +{ + local ($descr, $tmp); + + print_entry () if %curentry; + + $class = next_token (0); + parse_error () if !defined ($class); + + $subclass = next_token (0); + parse_error () if !defined ($subclass); + + $tmp = next_token (0); + parse_error () if !defined ($tmp); + parse_error () if !($tmp eq '{'); + + add_dn_to_stack ("cn=$subclass"); + $curentry{'type'} = 'subclass'; + $curentry{'class'} = $class; + $curentry{'subclass'} = $subclass; +} + + +sub parse_hwaddress +{ + local ($type, $hw, $tmp); + + $type = next_token (0); + parse_error () if !defined ($type); + + $hw = next_token (0); + parse_error () if !defined ($hw); + $hw =~ s/;$//; + + $curentry{'hwaddress'} = "$type $hw"; +} + + +sub parse_range +{ + local ($tmp, $str); + + $str = remaining_line (); + + if (!($str eq '')) + { + $str =~ s/;$//; + $curentry{'range'} = $str; + } +} + + +sub parse_statement +{ + local ($token) = shift; + local ($str); + + if ($token eq 'option') + { + $str = remaining_line (); + push (@{$curentry{'options'}}, $str); + } + else + { + $str = $token . " " . remaining_line (); + push (@{$curentry{'statements'}}, $str); + } +} + + +my $token; +my $token_number = 0; +my $line_number = 0; +my %curentry; + +$current_dn = "cn=DHCP Config, $basedn"; +$curentry{'descr'} = 'DHCP Config'; +$line = ''; + +while (($token = next_token (1))) + { + if ($token eq '}') + { + print_entry () if %curentry; + remove_dn_from_stack (); + } + elsif ($token eq 'subnet') + { + parse_subnet (); + next; + } + elsif ($token eq 'shared-network') + { + parse_shared_network (); + next; + } + elsif ($token eq 'class') + { + parse_class (); + next; + } + elsif ($token eq 'subclass') + { + parse_subclass (); + next; + } + elsif ($token eq 'pool') + { + parse_pool (); + next; + } + elsif ($token eq 'group') + { + parse_group (); + next; + } + elsif ($token eq 'host') + { + parse_host (); + next; + } + elsif ($token eq 'hardware') + { + parse_hwaddress (); + next; + } + elsif ($token eq 'range') + { + parse_range (); + next; + } + else + { + parse_statement ($token); + next; + } + } + + Index: draft-ietf-dhc-ldap-schema-01.txt =================================================================== RCS file: draft-ietf-dhc-ldap-schema-01.txt diff -N draft-ietf-dhc-ldap-schema-01.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ draft-ietf-dhc-ldap-schema-01.txt 5 Mar 2007 22:51:29 -0000 1.3 @@ -0,0 +1,1089 @@ + + + + + +Network Working Group M. Meredith, +Internet Draft V. Nanjundaswamy, +Document: M. Hinckley +Category: Proposed Standard Novell Inc. +Expires: 15th December 2001 16th June 2001 + + + LDAP Schema for DHCP + +Status of this Memo + +This document is an Internet-Draft and is in full conformance with all +provisions of Section 10 of RFC2026 [ ]. + +Internet-Drafts are working documents of the Internet Engineering Task +Force (IETF), its areas, and its working groups. Note that other groups +may also distribute working documents as Internet-Drafts. Internet- +Drafts are draft documents valid for a maximum of six months and may be +updated, replaced, or obsolete by other documents at any time. It is +inappropriate to use Internet-Drafts as reference material or to cite +them other than as "work in progress." The list of current Internet- +Drafts can be accessed at http://www.ietf.org/ietf/1id-abstracts.txt The +list of Internet-Draft Shadow Directories can be accessed at +http://www.ietf.org/shadow.html. + +1. Abstract + +This document defines a schema for representing DHCP configuration in an +LDAP directory. It can be used to represent the DHCP Service +configuration(s) for an entire enterprise network, a subset of the +network, or even a single server. Representing DHCP configuration in an +LDAP directory enables centralized management of DHCP services offered +by one or more DHCP Servers within the enterprise. + +2. Conventions used in this document + +The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", +"SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this +document are to be interpreted as described in RFC-2119 [ ]. + +In places where different sets of terminology are commonly used to +represent similar DHCP concepts, this schema uses the terminology of the +Internet Software Consortium's DHCP server reference implementation. +For more information see www.isc.org. + +3. Design Considerations + +The DHCP LDAP schema is designed to be a simple multi-server schema. The + + + +M. Meredith et al. Expires December 2001 [Page 1] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +intent of this schema is to provide a basic framework for representing +the most common elements used in the configuration of DHCP Server. This +should allow other network services to obtain and use basic DHCP +configuration information in a server-independent but knowledgeable way. + +It is expected that some implementations may need to extend the schema +objects, in order to implement all of their features or needs. It is +recommended that you use the schema defined in this draft to represent +DHCP configuration information in an LDAP directory. Conforming to a +standard schema improves interoperability between DHCP implementations +from different vendors. + +Some implementations may choose not to support all of the objects +defined here. + +Two decisions are explicitly left up to each implementation: + +First, implementations may choose not to store the lease information in +the directory, so those objects would not be used. + +Second, implementations may choose not to implement the auditing +information. + +It is up to the implementation to determine if the data in the directory +is considered "authoritative", or if it is simply a copy of data from an +authoritative source. Validity of the information if used as a copy is +to be ensured by the implementation. + +Primarily two types of applications will use the information in this +schema: 1. DHCP servers (for loading their configuration) 2. Management +Interfaces (for defining/editing configurations). + +The schema should be efficient for the needs of both types of +applications. The schema is designed to allow objects managed by DHCP +(such as computers, subnets, etc) to be present anywhere in a directory +hierarchy (to allow those objects to be placed in the directory for +managing administrative control and access to the objects). + +The schema uses a few naming conventions - all object classes and +attributes are prefixed with "dhcp" to decrease the chance that object +classes and attributes will have the same name. The schema also uses +standard naming attributes ("cn", "ou", etc) for all objects. + +4. Common DHCP Configuration Attributes + +Although DHCP manages several different types of objects, the +configuration of those objects is often similar. Consequently, most of +these objects have a common set of attributes, which are defined below. + + + +M. Meredith et al. Expires December 2001 [Page 2] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +4.1. Attributes Definitions + +The schema definitions listed below are for readability. The LDIF +layout for this schema will follow in section 8. + +Name: dhcpPrimaryDN Description: The Distinguished Name of the +dhcpServer object, which is the primary server for the configuration. +Syntax: DN Flags: SINGLE-VALUE + +Named: dhcpSecondaryDN Description: The Distinguished Name(s) of the +dhcpServer object(s), which are secondary servers for the configuration. +Syntax: DN + +Name: dhcpStatements Description: Flexible storage for representing any +specific data depending on the object to which it is attached. Examples +include conditional statements, Server parameters, etc. This also +serves as a 'catch-all' attribute that allows the standard to evolve +without needing to update the schema. Syntax: IA5String + +Name: dhcpRange Description: The starting and ending IP Addresses in the +range (inclusive), separated by a hyphen; if the range only contains one +address, then just the address can be specified with no hyphen. Each +range is defined as a separate value. Syntax: IA5String + +Name: dhcpPermitList Description: This attribute contains the permit +lists associated with a pool. Each permit list is defined as a separate +value. Syntax: IA5String + +Name: dhcpNetMask Description: The subnet mask length for the subnet. +The mask can be easily computed from this length. Syntax: Integer +Flags: SINGLE-VALUE + +Name: dhcpOption Description: Encoded option values to be sent to +clients. Each value represents a single option and contains (OptionTag, +Length, OptionData) encoded in the format used by DHCP. For more +information see [DHCPOPT]. Syntax: OctetString + +Name: dhcpClassData Description: Encoded text string or list of bytes +expressed in hexadecimal, separated by colons. Clients match subclasses +based on matching the class data with the results of a 'match' or 'spawn +with' statement in the class name declarations. Syntax: IA5String +Flags: SINGLE-VALUE + +Name: dhcpSubclassesDN Description: List of subclasses, these are the +actual DN of each subclass object. Syntax: DN + +Name: dhcpClassesDN Description: List of classes, these are the actual +DN of each class object. Syntax: DN + + + +M. Meredith et al. Expires December 2001 [Page 3] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +Name: dhcpSubnetDN Description: List of subnets, these are the actual DN +of each subnet object. Syntax: DN + +Name: dhcpPoolDN Description: List of pools, these are the actual DN of +each Pool object. Syntax: DN + +Name: dhcpOptionsDN Description: List of options, these are the actual +DN of each Options object. Syntax: DN + +Name: dhcpHostDN Description: List of hosts, these are the actual DN of +each host object. Syntax: DN + +Name: dhcpSharedNetworkDN Description: List of shared networks, these +are the actual DN of each shared network object. Syntax: DN + +Name: dhcpGroupDN Description: List of groups, these are the actual DN +of each Group object. Syntax: DN + +Name: dhcpLeaseDN Description: Single Lease DN. A dhcpHost configuration +uses this attribute to identify a static IP address assignment. Syntax: +DN Flags: SINGLE-VALUE + +Name: dhcpLeasesDN Description: List of leases, these are the actual DN +of each lease object. Syntax: DN + +Name: dhcpServiceDN Description: The DN of dhcpService object(s)which +contain the configuration information. Each dhcpServer object has this +attribute identifying the DHCP configuration(s) that the server is +associated with. Syntax: DN + +Name: dhcpHWAddress Description: The hardware address of the client +associated with a lease Syntax: OctetString Flags: SINGLE-VALUE + +Name: dhcpVersion Description: This is the version identified for the +object that this attribute is part of. In case of the dhcpServer object, +this represents the DHCP software version. Syntax: IA5String Flags: +SINGLE-VALUE + +Name: dhcpImplementation Description: DHCP Server implementation +description e.g. DHCP Vendor information. Syntax: IA5String Flags: +SINGLE-VALUE + +Name: dhcpHashBucketAssignment Description: HashBucketAssignment bit map +for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC +3074]. Syntax: Octet String Flags: SINGLE-VALUE + +Name: dhcpDelayedServiceParameter Description: Delay in seconds +corresponding to Delayed Service Parameter configuration, as defined in + + + +M. Meredith et al. Expires December 2001 [Page 4] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +DHC Load Balancing Algorithm [RFC 3074]. Syntax: Integer Flags: SINGLE- +VALUE + +Name: dhcpMaxClientLeadTime Description: Maximum Client Lead Time +configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR] +Syntax: Integer Flags: SINGLE-VALUE + +Name: dhcpFailOverEndpointState Description: Server (Failover Endpoint) +state, as defined in DHCP Failover Protocol [FAILOVR] Syntax: IA5String +Flags: SINGLE-VALUE + +5. Configurations and Services + +The schema definitions below are for readability the LDIF layout for +this schema will follow in section 8. + +The DHC working group is currently considering several proposals for +fail-over and redundancy of DHCP servers. These may require sharing of +configuration information between servers. This schema provides a +generalized mechanism for supporting any of these proposals, by +separating the definition of a server from the definition of +configuration service provided by the server. + +Separating the DHCP Server (dhcpServer) and the DHCP Configuration +(dhcpService) representations allows a configuration service to be +provided by one or more servers. Similarly, a server may provide one or +more configurations. The schema allows a server to be configured as +either a primary or secondary provider of a DHCP configuration. + +Configurations are also defined so that one configuration can include +some of the objects that are defined in another configuration. This +allows for sharing and/or a hierarchy of related configuration items. + +Name: dhcpService Description: Service object that represents the +actual DHCP Service configuration. This will be a container with the +following attributes. Must: cn, dhcpPrimaryDN May: dhcpSecondaryDN, +dhcpSharedNetworkDN, dhcpSubnetDN, dhcpGroupDN, dhcpHostDN, +dhcpClassesDN, dhcpOptionsDN, dhcpStatements + +The following objects could exist inside the dhcpService container: +dhcpSharedNetwork, dhcpSubnet, dhcpGroup, dhcpHost, dhcpClass, +dhcpOptions, dhcpLog + +Name: dhcpServer Description: Server object that the DHCP server will +login as. The configuration information is in the dhcpService container +that the dhcpServiceDN points to. Must: cn, dhcpServiceDN May: +dhcpVersion, dhcpImplementation, dhcpHashBucketAssignment, +dhcpDelayedServiceParameter, dhcpMaxClientLeadTime, + + + +M. Meredith et al. Expires December 2001 [Page 5] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 +dhcpFailOverEndpointState, dhcpStatements + +5.1. DHCP Declaration related classes: + +Name: dhcpSharedNetwork Description: Shared Network class will list what +pools and subnets are in this network. + +This will be a container with the following attributes. Must: cn May: +dhcpSubnetDN, dhcpPoolDN, dhcpOptionsDN, dhcpStatements + +The following objects can exist within a dhcpSharedNetwork container: +dhcpSubnet, dhcpPool, dhcpOptions, dhcpLog + +Name: dhcpSubnet Description: Subnet object will include configuration +information associated with a subnet, including a range and a net mask. + +This will be a container with the following attributes. Must: cn +(Subnet address), dhcpNetMask May: dhcpRange, dhcpPoolDN, dhcpGroupDN, +dhcpHostDN, dhcpClassesDN, dhcpLeasesDN, dhcpOptionsDN, dhcpStatements + +The following objects can exist within a dhcpSubnet container: dhcpPool, +dhcpGroup, dhcpHost, dhcpClass, dhcpOptions, dhcpLease, dhcpLog + +Name: dhcpGroup Description: Group object will have configuration +information associated with a group. + +This will be a container with the following attributes. Must: cn May: +dhcpHostDN, dhcpOptionsDN, dhcpStatements + +The following objects can exist within a dhcpGroup container: dhcpHost, +dhcpOptions + +Name: dhcpHost Description: The host object includes DHCP host +declarations to assign a static IP address or declare the client as +known or specify statements for a specific client. Must: cn May: +dhcpLeaseDN, dhcpHWAddress, dhcpOptionsDN, dhcpStatements + +The following objects can exist within a dhcpHost container: dhcpLease, +dhcpOptions + +Name: dhcpOptions Description: The options class is for option space +declarations, it contains a list of options. Must: cn, dhcpOption + +Name: dhcpClass Description: This is a class to group clients together +based on matching rules. + +This will be a container with the following attributes. Must: cn May: +dhcpSubClassesDN, dhcpOptionsDN, dhcpStatements + +The following object can exist within a dhcpClass container: +dhcpSubclass, dhcpOptions + + + +M. Meredith et al. Expires December 2001 [Page 6] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +Name: dhcpSubClass Description: This includes configuration information +for a subclass associated with a class. The dhcpSubClass object will +always be contained within the corresponding class container object. +Must: cn May: dhcpClassData, dhcpOptionsDN, dhcpStatements + +Name: dhcpPool Description: This contains configuration for a pool that +will have the range of addresses, permit lists and point to classes and +leases that are members of this pool. + +This will be a container that could be contained by dhcpSubnet or a +dhcpSharedNetwork. Must: cn, dhcpRange May: dhcpClassesDN, +dhcpPermitList, dhcpLeasesDN, dhcpOptionsDN, dhcpStatements + +The following objects can exist within a dhcpPool container: dhcpClass, +dhcpOptions, dhcpLease, dhcpLog + +6. Tracking Address Assignments + +The behavior of a DHCP server is influenced by two factors - it's +configuration and the current state of the addresses that have been +assigned to clients. This schema defines a set of objects for +representing the DHCP configuration associated with a server. The +following object classes provide the ability to record how addresses are +used including maintaining history (audit log) on individual leases. +Recording lease information in a directory could result in a significant +performance impact and is therefore optional. Implementations supporting +logging of leases need to consider the performance impact. + +6.1. dhcpLeases Attribute Definitions + +The schema definitions below are for readability the LDIF layout for +this schema will follow in section 8. + +Name: dhcpAddressState Description: This stores information about the +current binding-status of an address. For dynamic addresses managed by +DHCP, the values should be restricted to the states defined in the DHCP +Failover Protocol draft [FAILOVR]: 'FREE', 'ACTIVE', 'EXPIRED', +'RELEASED', 'RESET', 'ABANDONED', 'BACKUP'. For more information on +these states see [FAILOVR]. For other addresses, it SHOULD be one of +the following: 'UNKNOWN', 'RESERVED' (an address that is managed by DHCP +that is reserved for a specific client), 'RESERVED-ACTIVE' (same as +reserved, but address is currently in use), 'ASSIGNED' (assigned +manually or by some other mechanism), 'UNASSIGNED', 'NOTASSIGNABLE'. +Syntax: IA5String Flags: SINGLE-VALUE + +Name: dhcpExpirationTime Description: This is the time the current lease +for an address expires. Syntax: DateTime Flags: SINGLE-VALUE + + + + +M. Meredith et al. Expires December 2001 [Page 7] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +Name: dhcpStartTimeOfState Description: This is the time of the last +state change for a leased address. Syntax: DateTime Flags: SINGLE-VALUE + +Name: dhcpLastTransactionTime Description: This is the last time a valid +DHCP packet was received from the client. Syntax: DateTime Flags: +SINGLE-VALUE + +Name: dhcpBootpFlag Description: This indicates whether the address was +assigned via BOOTP Syntax: Boolean Flags: SINGLE-VALUE + +Name: dhcpDomainName Description: This is the name of the domain sent to +the client by the server. It is essentially the same as the value for +DHCP option 15 sent to the client, and represents only the domain - not +the full FQDN. To obtain the full FQDN assigned to the client you must +prepend the "dhcpAssignedHostName" to this value with a ".". Syntax: +IA5String Flags: SINGLE-VALUE + +Name: dhcpDnsStatus Description: This indicates the status of updating +DNS resource records on behalf of the client by the DHCP server for this +address. The value is a 16-bit bitmask that has the same values as +specified by the Failover-DDNS option (see [FAILOVR]). Syntax: Integer +Flags: SINGLE-VALUE + +Name: dhcpRequestedHostName Description: This is the hostname that was +requested by the client. Syntax: IA5String Flags: SINGLE-VALUE + +Name: dhcpAssignedHostName Description: This is the actual hostname that +was assigned to a client. It may not be the name that was requested by +the client. The fully qualified domain name can be determined by +appending the value of "dhcpDomainName" (with a dot separator) to this +name. Syntax: IA5String Flags: SINGLE-VALUE + +Name: dhcpReservedForClient Description: This is the distinguished name +of the "dhcpHost" that an address is reserved for. This may not be the +same as the "dhcpAssignedToClient" attribute if the address is being +reassigned but the current lease has not yet expired. Syntax: DN Flags: +SINGLE-VALUE + +Name: dhcpAssignedToClient Description: This is the distinguished name +of a "dhcpHost" that an address is currently assigned to. This +attribute is only present in the class when the address is leased. +Syntax: DN Flags: SINGLE-VALUE + +Name: dhcpRelayAgentInfo Description: If the client request was received +via a relay agent, this contains information about the relay agent that +was available from the DHCP request. This is a hex-encoded option +value. Syntax: OctetString Flags: SINGLE-VALUE + +Name: dhcpErrorLog Description: Generic error log attribute that allows +logging error conditions within a dhcpService or a dhcpSubnet, like no IP +addresses available for lease. Syntax: IA5String + +M. Meredith et al. Expires December 2001 [Page 8] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +6.2. dhcpLeases Object Class + +This class represents an IP address. It may or may not be leaseable, +and the object may exist even though a lease is not currently active for +the associated IP address. + +It is recommended that all Lease objects for a single DHCP Service be +centrally located within a single container. This ensures that the lease +objects and the corresponding logs do not have to be relocated, when +address ranges allocated to individual DHCP subnets and/or pools change. + +The schema definitions below are for readability the LDIF layout for +this schema will follow in section 8. + +Name: dhcpLeases Description: This is the object that holds state +information about an IP address. The cn (which is the IP address), and +the current address-state are mandatory attributes. If the address is +assigned then, some of the optional attributes will have valid data. +Must: cn, dhcpAddressState May: dhcpExpirationTime, +dhcpStartTimeOfState, dhcpLastTransactionTime, dhcpBootpFlag, +dhcpDomainName, dhcpDnsStatus, dhcpRequestedHostName, +dhcpAssignedHostName, dhcpReservedForClient, dhcpAssignedToClient, +dhcpRelayAgentInfo, dhcpHWAddress + +6.3 Audit Log Information + +A dhcpLog object is created whenever a lease is assigned or released. +This object is intended to be created under the corresponding dhcpLeases +container, or dhcpPool, dhcpSubnet, dhcpSharedNetwork or dhcpService +containers. + +The log information under the dhcpLeases container would be for +addresses matching that lease information. The log information in the +other containers could be used for errors, i.e. when a pool or subnet is +out our addresses or if a server is not able to assign any more +addresses for a particular dhcpService. + +Name: dhcpLog Description: This is the object that holds past +information about an IP address. The cn is the time/date stamp when the +address was assigned or released, the address state at the time, if the +address was assigned or released. Must: cn May: dhcpAddressState, +dhcpExpirationTime, dhcpStartTimeOfState, dhcpLastTransactionTime, +dhcpBootpFlag, dhcpDomainName, dhcpDnsStatus, dhcpRequestedHostName, +dhcpAssignedHostName, dhcpReservedForClient, dhcpAssignedToClient, +dhcpRelayAgentInfo, dhcpHWAddress, dhcpErrorLog + + + + + + +M. Meredith et al. Expires December 2001 [Page 9] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +7. Determining settings + +The dhcpStatements attribute is the key to DHC enhancements that may +come along, and the different key words that a particular server +implementation may use. This attribute can be used to hold conditional +DHCP Statements and DHCP server parameters. Having a generic settings +attribute that is just a string, allows this schema to be extensible and +easy to configure. + +All of the attributes that end with DN are references to the class that +precedes the DN e.g. the dhcpPrimaryDN and dhcpSecondaryDN attributes +hold the Distinguished Names of the dhcpServer objects that are +associated with the dhcpService object. + +8. LDIF format for attributes and classes. + +# Attributes + +( 2.16.840.1.113719.1.203.4.1 NAME 'dhcpPrimaryDN' DESC +'The DN of the dhcpServer which is the primary server for the +configuration.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.2 NAME 'dhcpSecondaryDN' DESC 'The DN of +dhcpServer(s) which provide backup service for the configuration.' +SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.3 NAME 'dhcpStatements' DESC 'Flexible +storage for specific data depending on what object this exists in. Like +conditional statements, server parameters, etc. This allows the standard +to evolve without needing to adjust the schema.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.26 ) + +( 2.16.840.1.113719.1.203.4.4 NAME 'dhcpRange' DESC 'The starting & +ending IP Addresses in the range (inclusive), separated by a hyphen; if +the range only contains one address, then just the address can be +specified with no hyphen. Each range is defined as a separate value.' +SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) + +( 2.16.840.1.113719.1.203.4.5 NAME 'dhcpPermitList' DESC 'This attribute +contains the permit lists associated with a pool. Each permit list is +defined as a separate value.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) + +( 2.16.840.1.113719.1.203.4.6 NAME 'dhcpNetMask' DESC 'The subnet mask +length for the subnet. The mask can be easily computed from this +length.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.7 NAME 'dhcpOption' DESC 'Encoded option +values to be sent to clients. Each value represents a single option and +contains (OptionTag, Length, OptionValue) encoded in the format used by +DHCP.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) + +M. Meredith et al. Expires December 2001 [Page 10] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +( 2.16.840.1.113719.1.203.4.8 NAME 'dhcpClassData' DESC 'Encoded text +string or list of bytes expressed in hexadecimal, separated by colons. +Clients match subclasses based on matching the class data with the +results of match or spawn with statements in the class name +declarations.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.9 NAME 'dhcpOptionsDN' DESC 'The +distinguished name(s) of the dhcpOption objects containing the +configuration options provided by the server.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.10 NAME 'dhcpHostDN' DESC 'the distinguished +name(s) of the dhcpHost objects.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.11 NAME 'dhcpPoolDN' DESC 'The distinguished +name(s) of pools.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.12 NAME 'dhcpGroupDN' DESC 'The +distinguished name(s) of the groups.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.13 NAME 'dhcpSubnetDN' DESC 'The +distinguished name(s) of the subnets.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.14 NAME 'dhcpLeaseDN' DESC 'The +distinguished name of a client address.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE) + +( 2.16.840.1.113719.1.203.4.15 NAME 'dhcpLeasesDN' DESC 'The +distinguished name(s) client addresses.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.16 NAME 'dhcpClassesDN' DESC 'The +distinguished name(s) of a class(es) in a subclass.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.17 NAME 'dhcpSubclassesDN' DESC 'The +distinguished name(s) of subclass(es).' SYNTAX +1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.18 NAME 'dhcpSharedNetworkDN' DESC 'The +distinguished name(s) of sharedNetworks.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.19 NAME 'dhcpServiceDN' DESC 'The DN of +dhcpService object(s)which contain the configuration information. Each +dhcpServer object has this attribute identifying the DHCP + + + +M. Meredith et al. Expires December 2001 [Page 11] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +configuration(s) that the server is associated with.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.12 ) + +( 2.16.840.1.113719.1.203.4.20 NAME 'dhcpVersion' DESC 'The version +attribute of this object.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE- +VALUE ) + +( 2.16.840.1.113719.1.203.4.21 NAME 'dhcpImplementation' DESC +'Description of the DHCP Server implementation e.g. DHCP Server's +vendor.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.22 NAME 'dhcpAddressState' DESC 'This stores +information about the current binding-status of an address. For dynamic +addresses managed by DHCP, the values should be restricted to the +following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", +"ABANDONED", "BACKUP". For other addresses, it SHOULD be one of the +following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP +that is reserved for a specific client), "RESERVED-ACTIVE" (same as +reserved, but address is currently in use), "ASSIGNED" (assigned +manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".' +SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.23 NAME 'dhcpExpirationTime' DESC 'This is +the time the current lease for an address expires.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.24 NAME 'dhcpStartTimeOfState' DESC 'This is +the time of the last state change for a leased address.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.25 NAME 'dhcpLastTransactionTime' DESC 'This +is the last time a valid DHCP packet was received from the client.' +SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.26 NAME 'dhcpBootpFlag' DESC 'This indicates +whether the address was assigned via BOOTP.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.27 NAME 'dhcpDomainName' DESC 'This is the +name of the domain sent to the client by the server. It is essentially +the same as the value for DHCP option 15 sent to the client, and +represents only the domain - not the full FQDN. To obtain the full FQDN +assigned to the client you must prepend the "dhcpAssignedHostName" to +this value with a ".".' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE- +VALUE ) + +( 2.16.840.1.113719.1.203.4.28 NAME 'dhcpDnsStatus' DESC 'This indicates +the status of updating DNS resource records on behalf of the client by + + + +M. Meredith et al. Expires December 2001 [Page 12] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +the DHCP server for this address. The value is a 16-bit bitmask.' +SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.29 NAME 'dhcpRequestedHostName' DESC 'This +is the hostname that was requested by the client.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.30 NAME 'dhcpAssignedHostName' DESC 'This is +the actual hostname that was assigned to a client. It may not be the +name that was requested by the client. The fully qualified domain name +can be determined by appending the value of "dhcpDomainName" (with a dot +separator) to this name.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE- +VALUE ) + +( 2.16.840.1.113719.1.203.4.31 NAME 'dhcpReservedForClient' DESC 'The +distinguished name of a "dhcpClient" that an address is reserved for. +This may not be the same as the "dhcpAssignedToClient" attribute if the +address is being reassigned but the current lease has not yet expired.' +SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.32 NAME 'dhcpAssignedToClient' DESC 'This is +the distinguished name of a "dhcpClient" that an address is currently +assigned to. This attribute is only present in the class when the +address is leased.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.33 NAME 'dhcpRelayAgentInfo' DESC 'If the +client request was received via a relay agent, this contains information +about the relay agent that was available from the DHCP request. This is +a hex-encoded option value.' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 +SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.34 NAME 'dhcpHWAddress' DESC 'The clients +hardware address that requested this IP address.' SYNTAX +1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.35 NAME 'dhcpHashBucketAssignment' DESC +'HashBucketAssignment bit map for the DHCP Server, as defined in DHC +Load Balancing Algorithm [RFC 3074].' SYNTAX +1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.36 NAME 'dhcpDelayedServiceParameter' DESC +'Delay in seconds corresponding to Delayed Service Parameter +configuration, as defined in DHC Load Balancing Algorithm [RFC 3074]. ' +SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.37 NAME 'dhcpMaxClientLeadTime' DESC +'Maximum Client Lead Time configuration in seconds, as defined in DHCP +Failover Protocol [FAILOVR]' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + + + +M. Meredith et al. Expires December 2001 [Page 13] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.38 NAME 'dhcpFailOverEndpointState' DESC +'Server (Failover Endpoint) state, as defined in DHCP Failover Protocol +[FAILOVR]' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) + +( 2.16.840.1.113719.1.203.4.39 NAME 'dhcpErrorLog' DESC +Generic error log attribute that allows logging error conditions within a +dhcpService or a dhcpSubnet, like no IP addresses available for lease. +SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) + +#Classes + +( 2.16.840.1.113719.1.203.6.1 NAME 'dhcpService' DESC ' Service object +that represents the actual DHCP Service configuration. This is a +container object.' SUP top MUST (cn $ dhcpPrimaryDN) MAY +(dhcpSecondaryDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpGroupDN $ +dhcpHostDN $ dhcpClassesDN $ dhcpOptionsDN $ dhcpStatements ) ) + +( 2.16.840.1.113719.1.203.6.2 NAME 'dhcpSharedNetwork' DESC 'This stores +configuration information for a shared network.' SUP top MUST cn MAY +(dhcpSubnetDN $ dhcpPoolDN $ dhcpOptionsDN $ dhcpStatements) X- +NDS_CONTAINMENT ('dhcpService' ) ) + +( 2.16.840.1.113719.1.203.6.3 NAME 'dhcpSubnet' DESC 'This class defines +a subnet. This is a container object.' SUP top MUST ( cn $ dhcpNetMask ) +MAY (dhcpRange $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ +dhcpLeasesDN $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT +('dhcpService' 'dhcpSharedNetwork') ) + +( 2.16.840.1.113719.1.203.6.4 NAME 'dhcpPool' DESC 'This stores +configuration information about a pool.' SUP top MUST ( cn $ dhcpRange ) +MAY (dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ +dhcpStatements) X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') ) + +( 2.16.840.1.113719.1.203.6.5 NAME 'dhcpGroup' DESC 'Group object that +lists host DNs and parameters. This is a container object.' SUP top MUST +cn MAY ( dhcpHostDN $ dhcpOptionsDN $ dhcpStatements ) X-NDS_CONTAINMENT +('dhcpSubnet' 'dhcpService' ) ) + +( 2.16.840.1.113719.1.203.6.6 NAME 'dhcpHost' DESC 'This represents +information about a particular client' SUP top MUST cn MAY (dhcpLeaseDN +$ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT +('dhcpService' 'dhcpSubnet' 'dhcpGroup') ) + +( 2.16.840.1.113719.1.203.6.7 NAME 'dhcpClass' DESC 'Represents +information about a collection of related clients.' SUP top MUST cn MAY +(dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT +('dhcpService' 'dhcpSubnet' ) ) + +( 2.16.840.1.113719.1.203.6.8 NAME 'dhcpSubClass' DESC 'Represents +information about a collection of related classes.' SUP top MUST cn MAY +(dhcpClassData $ dhcpOptionsDN $ dhcpStatements) X-NDS_CONTAINMENT + + + +M. Meredith et al. Expires December 2001 [Page 14] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +'dhcpClass' ) + +( 2.16.840.1.113719.1.203.6.9 NAME 'dhcpOptions' DESC 'Represents +information about a collection of options defined.' SUP top MUST cn MAY +( dhcpOption ) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' +'dhcpSubnet' 'dhcpPool' 'dhcpGroup' 'dhcpHost' 'dhcpClass' ) + +( 2.16.840.1.113719.1.203.6.10 NAME 'dhcpLeases' DESC 'This class +represents an IP Address, which may or may not have been leased.' SUP +top MUST ( cn $ dhcpAddressState ) MAY ( dhcpExpirationTime $ +dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ +dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ +dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ +dhcpRelayAgentInfo $ dhcpHWAddress ) X-NDS_CONTAINMENT ( 'dhcpService' +'dhcpSubnet' 'dhcpPool') ) + +( 2.16.840.1.113719.1.203.6.11 NAME 'dhcpLog' DESC 'This is the object +that holds past information about the IP address. The cn is the +time/date stamp when the address was assigned or released, the address +state at the time, if the address was assigned or released.' SUP top +MUST ( cn ) MAY ( dhcpAddressState $ dhcpExpirationTime $ +dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ +dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ +dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ +dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog) X-NDS_CONTAINMENT +('dhcpLeases' 'dhcpPool' 'dhcpSubnet' 'dhcpSharedNetwork' 'dhcpService' ) ) + +( 2.16.840.1.113719.1.203.6.12 NAME 'dhcpServer' DESC 'DHCP Server +Object' SUP top MUST (cn, dhcpServiceDN) MAY (dhcpVersion $ +dhcpImplementation $ dhcpHashBucketAssignment $ +dhcpDelayedServiceParameter $ dhcpMaxClientLeadTime $ +dhcpFailOverEndpointState $ dhcpStatements) X-NDS_CONTAINMENT ('O' 'OU' +'dc') ) + +9. Security Considerations + +Since the DHCP Configuration information is stored in a directory, the +security of the information is limited to the security offered by the +directory including the security of the objects within that directory. + +10. Intellectual Property Rights Notices + +The IETF takes no position regarding the validity or scope of any +intellectual property or other rights that might be claimed to pertain +to the implementation or use of the technology described in this +document or the extent to which any license under such rights might or +might not be available; neither does it represent that it has made any +effort to identify any such rights. Information on the IETF's +procedures with respect to rights in standards-track and standards- + + + +M. Meredith et al. Expires December 2001 [Page 15] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +related documentation can be found in BCP-11. Copies of claims of +rights made available for publication and any assurances of licenses to +be made available, or the result of an attempt made to obtain a general +license or permission for the use of such proprietary rights by +implementors or users of this specification can be obtained from the +IETF Secretariat. + +The IETF invites any interested party to bring to its attention any +copyrights, patents or patent applications, or other proprietary rights +which may cover technology that may be required to practice this +standard. Please address the information to the IETF Executive +Director. + +11. Full Copyright Statement + +Copyright (C) The Internet Society (2001). All Rights Reserved. + +This document and translations of it may be copied and furnished to +others, and derivative works that comment on or otherwise explain it or +assist in its implementation may be prepared, copied, published and +distributed, in whole or in part, without restriction of any kind, +provided that the above copyright notice and this paragraph are included +on all such copies and derivative works. However, this document itself +may not be modified in any way, such as by removing the copyright notice +or references to the Internet Society or other Internet organizations, +except as needed for the purpose of developing Internet standards in +which case the procedures for copyrights defined in the Internet +Standards process must be followed, or as required to translate it into +languages other than English. + +The limited permissions granted above are perpetual and will not be +revoked by the Internet Society or its successors or assigns. + +This document and the information contained herein is provided on an "AS +IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING TASK +FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT +INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR +FITNESS FOR A PARTICULAR PURPOSE. + +12. References + +[RFC2131] Droms, R., "Dynamic Host Configuration Protocol", RFC 2131, +March 1997. + +[RFC2132] Alexander, S., Droms, R., "DHCP Options and BOOTP Vendor +Extensions", RFC 2132, March 1997. + + + + +M. Meredith et al. Expires December 2001 [Page 16] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +[MSDHCP] Gu, Y., Vyaghrapuri, R., "An LDAP Schema for Dynamic Host +Configuration Protocol Service", Internet Draft , August 1998. + +[NOVDHCP] Miller, T., Patel, A., Rao, P., "Lightweight Directory Access +Protocol (v3): Schema for Dynamic Host Configuration Protocol (DHCP)", +Internet Draft , June 1998. + +[FAILOVR] Droms, R., Rabil, G., Dooley, M., Kapur, A., Gonczi, S., Volz, +B., "DHCP Failover Protocol", Internet Draft , July 2000. + +[RFC 3074] Volz B., Gonczi S., Lemon T., Stevens R., "DHC Load Balancing +Algorithm", February 2001 + +[AGENT] Patrick, M., "DHCP Relay Agent Information Option", Internet +Draft , March 2000. + +[DHCPOPT] Carney, M., "New Option Review Guidelines and Additional +Option Namespace", Internet Draft , October 1999. + +[POLICY] Strassner, J., Elleson, E., Moore, B., "Policy Framework LDAP +Core Schema", Internet Draft , +November 1999. + +[RFC2251] Wahl, M., Howes, T., Kille, S., "Lightweight Directory Access +Protocol (v3)", RFC 2251, December 1997. + +[RFC2252] Wahl, M., Coulbeck, A., Howes, T., Kille, S., "Lightweight +Directory Access Protocol (v3) Attribute Syntax Definitions", RFC 2252, +December 1997. + +[RFC2255] Howes, T., Smith, M., "The LDAP URL Format", RFC 2255, +December 1997. + +[RFC951] Croft, B., Gilmore, J., "Bootstrap Protocol (BOOTP)", RFC 951, +September 1985. + +[RFC2119] Bradner, S. "Key words for use in RFCs to Indicate Requirement +Levels", RFC 2119, March 1997. + +13. Acknowledgments + +This work is partially based on a previous draft draft-ietf-dhc- +schema-02.doc. + + + + + +M. Meredith et al. Expires December 2001 [Page 17] + + + + + +INTERNET-DRAFT LDAP Schema for DHCP 16 June 2001 + + +14. Author's Addresses + +Comments regarding this draft may be sent to the authors at the +following address: + +Mark Meredith +Mark Hinckley +Novell Inc. +1800 S. Novell Place +Provo, Utah 84606 + +Vijay K. Nanjundaswamy +Novell Software Development (I) Ltd +49/1 & 49/3, Garvebhavi Palya, +7th Mile, Hosur Road +Bangalore 560068 + +email: mark_meredith at novell.com +email: knvijay at novell.com +email: mhinckley at novell.com + +This Internet Draft expires December 16, 2001. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +M. Meredith et al. Expires December 2001 [Page 18] + + + + Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 5 Mar 2007 22:47:40 -0000 1.16 +++ .cvsignore 5 Mar 2007 22:51:29 -0000 1.17 @@ -1,2 +1 @@ dhcp-3.0.5.tar.gz -dhcp-3.0.5-ldap-patch Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- dhcp.spec 5 Mar 2007 22:47:40 -0000 1.147 +++ dhcp.spec 5 Mar 2007 22:51:29 -0000 1.148 @@ -10,7 +10,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Name: dhcp Version: 3.0.5 -Release: 26%{?dist} +Release: 25%{?dist} Epoch: 12 License: ISC Group: System Environment/Daemons @@ -21,8 +21,10 @@ Source3: dhcrelay.init Source4: dhcpd.conf Source5: libdhcp4client.pc -Source6: linux.dbus-example -Source7: http://home.ntelos.net/~masneyb/%{name}-%{version}-ldap-patch +Source6: README.ldap +Source7: draft-ietf-dhc-ldap-schema-01.txt +Source8: dhcpd-conf-to-ldap.pl +Source9: linux.dbus-example Patch0: dhcp-3.0.5-extended-new-option-info.patch Patch1: dhcp-3.0.5-Makefile.patch @@ -38,7 +40,8 @@ Patch11: dhcp-3.0.5-timeouts.patch Patch12: dhcp-3.0.5-fix-warnings.patch Patch13: dhcp-3.0.5-xen-checksum.patch -Patch14: dhcp-3.0.5-no-win32.patch +Patch14: dhcp-3.0.5-ldap-configuration.patch +Patch15: dhcp-3.0.5-no-win32.patch # adds libdhcp4client to the ISC code base Patch50: dhcp-3.0.5-libdhcp4client.patch @@ -152,25 +155,27 @@ # Fix Xen host networking problems (partial checksums) #%patch13 -p1 -b .xen +# Add support for dhcpd.conf data in LDAP +%patch14 -p1 -b .ldap + # The contrib/ms2isc/Registry.pm file requires Win32API::Registry, which is # not part of Fedora by default. We comment out this use line in the script # so that RPM doesn't automatically add perl(Win32API::Registry) dependency. # The patch puts a comment in the script telling the user which perl module # should be installed to use the Registry.pm contrib file. -%patch14 -p1 -b .no-win32 - -# Add support for dhcpd.conf data in LDAP. This patch is from an upstream -# location, so we refer to the source file here and manually invoke the -# patch command. -%{__patch} -p1 -b -z .ldap < %SOURCE7 +%patch15 -p1 -b .no-win32 -# Add the libdhcp4client target (library version of dhclient). This must be -# the last patch applied to the source tree. +# Add the libdhcp4client target (library version of dhclient) %patch50 -p1 -b .libdhcp4client +# Copy in documentation and example scripts for LDAP patch to dhcpd +%{__cp} -p %SOURCE6 . +%{__cp} -p %SOURCE7 doc +%{__cp} -p %SOURCE8 contrib + # Copy in example dhclient script for use with D-BUS (requires extended # new option info patch too) -%{__cp} -p %SOURCE6 client/scripts +%{__cp} -p %SOURCE9 client/scripts %build %{__cp} %SOURCE1 . @@ -330,9 +335,6 @@ %{_libdir}/libdhcp4client.so %changelog -* Mon Mar 05 2007 David Cantrell - 12:3.0.5-26 -- Use better upstream version of the LDAP configuration patch (#225691) - * Mon Mar 05 2007 David Cantrell - 12:3.0.5-25 - Man pages need 0644 permissions (#222572) Index: sources =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 5 Mar 2007 22:47:40 -0000 1.17 +++ sources 5 Mar 2007 22:51:29 -0000 1.18 @@ -1,2 +1 @@ ce5d30d4645e4eab1f54561b487d1ec7 dhcp-3.0.5.tar.gz -41cde9e9a768bf12390288465ef30bbd dhcp-3.0.5-ldap-patch From fedora-cvs-commits at redhat.com Mon Mar 5 22:51:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 17:51:59 -0500 Subject: rpms/xorg-x11-server/devel xserver-1.2.0-honor-displaysize.patch, NONE, 1.1 xorg-x11-server.spec, 1.209, 1.210 Message-ID: <200703052251.l25MpxFL024133@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24098 Modified Files: xorg-x11-server.spec Added Files: xserver-1.2.0-honor-displaysize.patch Log Message: missed a patch xserver-1.2.0-honor-displaysize.patch: ddcProperty.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE xserver-1.2.0-honor-displaysize.patch --- --- xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c.jx 2007-02-26 13:39:00.000000000 -0500 +++ xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c 2007-02-26 14:37:33.000000000 -0500 @@ -313,8 +313,10 @@ preferred = PREFERRED_TIMING_MODE(DDC->features.msc); - Monitor->widthmm = 10 * DDC->features.hsize; - Monitor->heightmm = 10 * DDC->features.vsize; + if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) { + Monitor->widthmm = 10 * DDC->features.hsize; + Monitor->heightmm = 10 * DDC->features.vsize; + } /* If this is a digital display, then we can use reduced blanking */ if (DDC->features.input_type) Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- xorg-x11-server.spec 5 Mar 2007 22:33:49 -0000 1.209 +++ xorg-x11-server.spec 5 Mar 2007 22:51:57 -0000 1.210 @@ -51,6 +51,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 +Patch2004: xserver-1.2.0-honor-displaysize.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -270,6 +271,7 @@ %patch2001 -p1 -b .geode-mmx %patch2002 -p1 -b .xephyr-keysym %patch2003 -p1 -b .vfprintf +%patch2004 -p1 -b .displaysize %build From fedora-cvs-commits at redhat.com Mon Mar 5 23:04:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 18:04:23 -0500 Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 xorg-x11-drv-i810.spec, 1.46, 1.47 intel-945gm-lfp-blacklist.patch, 1.3, NONE intel-driver-rename.patch, 1.3, NONE intel-prune-by-edid-pixclock.patch, 1.2, NONE Message-ID: <200703052304.l25N4NrE000403@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv347/devel Modified Files: .cvsignore sources xorg-x11-drv-i810.spec Removed Files: intel-945gm-lfp-blacklist.patch intel-driver-rename.patch intel-prune-by-edid-pixclock.patch Log Message: auto-import xorg-x11-drv-i810-1.6.5-13.fc7 on branch devel from xorg-x11-drv-i810-1.6.5-13.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 30 Jan 2007 19:32:36 -0000 1.17 +++ .cvsignore 5 Mar 2007 23:04:21 -0000 1.18 @@ -1,2 +1,2 @@ xf86-video-i810-1.6.5.tar.bz2 -xf86-video-intel-modesetting-20070129.tar.bz2 +xf86-video-intel-1.9.91.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 30 Jan 2007 19:32:36 -0000 1.17 +++ sources 5 Mar 2007 23:04:21 -0000 1.18 @@ -1,2 +1,2 @@ fc1e0da3430551bf25a7babf7ccfd3bf xf86-video-i810-1.6.5.tar.bz2 -7243f6c6cb82ad701afa58be366e3864 xf86-video-intel-modesetting-20070129.tar.bz2 +a29358e73936dd531ba19c5556be9ebd xf86-video-intel-1.9.91.tar.bz2 Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- xorg-x11-drv-i810.spec 27 Feb 2007 20:31:59 -0000 1.46 +++ xorg-x11-drv-i810.spec 5 Mar 2007 23:04:21 -0000 1.47 @@ -2,23 +2,22 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define gitdate 20070129 +%define preview_version 1.9.91 Summary: Xorg X11 i810 video driver(s) Name: xorg-x11-drv-i810 Version: 1.6.5 -Release: 12%{?dist} +Release: 13%{?dist} URL: http://www.x.org -License: MIT +License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 -Source1: xf86-video-intel-modesetting-%{gitdate}.tar.bz2 +Source1: xf86-video-intel-%{preview_version}.tar.bz2 Source2: i810.xinf # modesetting driver patches -Patch0: intel-driver-rename.patch # stock driver patches Patch100: i810-1.6.5-to-git-20060911.patch @@ -51,9 +50,7 @@ X.Org X11 i810 video driver XvMC development package. %prep -# fc6 baseline patches %setup -q -c %{tarball}-%{version} -a0 -a1 -%patch0 -p0 -b .driver-rename %patch100 -p1 -b .i810-git-20060911 %patch101 -p1 -b .server-ranges %patch1000 -p1 -b .965-xv @@ -61,23 +58,17 @@ %build OPTS="--disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri" cd xf86-video-i810-%{version} && ./configure ${OPTS} && make && cd .. || exit 1 -cd xf86-video-intel && ./autogen.sh ${OPTS} && make && cd .. || exit 1 +cd xf86-video-intel-%{preview_version} && ./configure ${OPTS} && make && cd .. || exit 1 %install rm -rf $RPM_BUILD_ROOT -cd xf86-video-intel && make install DESTDIR=$RPM_BUILD_ROOT && cd .. \ - || exit 1 -# cheesy manpage fixup -mv ${RPM_BUILD_ROOT}/usr/share/man/man4/{i810,intel}.4 -cd xf86-video-i810-%{version} && make install DESTDIR=$RPM_BUILD_ROOT && cd .. \ - || exit 1 +cd xf86-video-intel-%{preview_version} && make install DESTDIR=$RPM_BUILD_ROOT && cd .. || exit 1 +cd xf86-video-i810-%{version} && make install DESTDIR=$RPM_BUILD_ROOT && cd .. || exit 1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/ -# FIXME: Remove all libtool archives (*.la) from modules directory. This -# should be fixed in upstream Makefile.am or whatever. find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- # Nuke until they're actually hooked up in the code @@ -104,6 +95,9 @@ %{_libdir}/libI810XvMC.so %changelog +* Mon Mar 05 2007 Adam Jackson 1.6.5-13 +- Updated modesetting driver to one that will actually work with a 1.3 server. + * Tue Feb 27 2007 Adam Jackson 1.6.5-12 - Nuke %%with_dri, since the arch list exactly matched the ExclusiveArch list - Remove ivch and ch7017 from the install since they aren't hooked up to the --- intel-945gm-lfp-blacklist.patch DELETED --- --- intel-driver-rename.patch DELETED --- --- intel-prune-by-edid-pixclock.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 5 23:37:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 18:37:18 -0500 Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.47,1.48 Message-ID: <200703052337.l25NbIdj006960@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6928 Modified Files: xorg-x11-drv-i810.spec Log Message: Bump sdk buildreq Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- xorg-x11-drv-i810.spec 5 Mar 2007 23:04:21 -0000 1.47 +++ xorg-x11-drv-i810.spec 5 Mar 2007 23:37:15 -0000 1.48 @@ -29,7 +29,7 @@ BuildRequires: pkgconfig BuildRequires: autoconf automake libtool -BuildRequires: xorg-x11-server-sdk >= 1.1.0-2 +BuildRequires: xorg-x11-server-sdk >= 1.2.99.901-1 BuildRequires: libXvMC-devel BuildRequires: mesa-libGL-devel >= 6.5-9 BuildRequires: libdrm-devel >= 2.0-1 From fedora-cvs-commits at redhat.com Mon Mar 5 23:38:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 18:38:16 -0500 Subject: rpms/setroubleshoot/devel .cvsignore, 1.68, 1.69 setroubleshoot.spec, 1.82, 1.83 sources, 1.78, 1.79 Message-ID: <200703052338.l25NcGJO007320@cvs.devel.redhat.com> Author: jdennis Update of /cvs/dist/rpms/setroubleshoot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7269/devel Modified Files: .cvsignore setroubleshoot.spec sources Log Message: auto-import setroubleshoot-1.9.3-1 on branch devel from setroubleshoot-1.9.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- .cvsignore 22 Feb 2007 19:11:37 -0000 1.68 +++ .cvsignore 5 Mar 2007 23:38:14 -0000 1.69 @@ -1 +1 @@ -setroubleshoot-1.9.2.tar.gz +setroubleshoot-1.9.3.tar.gz Index: setroubleshoot.spec =================================================================== RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- setroubleshoot.spec 22 Feb 2007 19:11:37 -0000 1.82 +++ setroubleshoot.spec 5 Mar 2007 23:38:14 -0000 1.83 @@ -1,6 +1,6 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 1.9.2 +Version: 1.9.3 Release: 1%{?dist} License: GPL Group: Applications/System @@ -44,16 +44,20 @@ %{_sysconfdir}/xdg/autostart/* %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/sealert.service +%{_datadir}/icons/hicolor %{pkgpythondir}/browser.py* %{pkgpythondir}/gui_utils.py* %{pkgpythondir}/email_dialog.py* -%{pkgpythondir}/runcmd.py* -%postun +%post /usr/bin/update-desktop-database %{_datadir}/applications +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -%post +%postun /usr/bin/update-desktop-database %{_datadir}/applications +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %prep %setup -q @@ -121,7 +125,6 @@ %{pkgpythondir}/access_control.py* %{pkgpythondir}/analyze.py* %{pkgpythondir}/avc_audit.py* -%{pkgpythondir}/cmd_job.py* %{pkgpythondir}/config.py* %{pkgpythondir}/email_alert.py* %{pkgpythondir}/errcode.py* @@ -145,20 +148,40 @@ /etc/rc.d/init.d/%{name} %changelog +* Mon Mar 5 2007 John Dennis - 1.9.3-1 + - install icon in /usr/share/icons, refer to icon by name using standard API + - Fix performance problems in setroubleshoot browser log file scanning + - Significant rewrite of data/view management code in setroubleshoot + browser. data and view now cleanly separated, can easily switch + between data views while maintaining selections, view state, with + proper update of status information in status area + - Resolves Bug# 227806: right click context menu resets selection + - Logfile scans now operate in independent thread, proper asynchronous + updates of browser during scan, browser used to appear to hang + - Resolves Bug# 224340: Rewrite Menu/Toobar/Popup to use UIManger instead of glade + - Add toobar support + - Implement GUI to edit email recipient list in setroubleshoot browser + - Added user help to setroubleshoot browser + - Related Bug# 224343: Fix setroubleshoot browser to respond to desktop theme changes + - improve traceback error reporting in sealert + - rewrite AboutDialog, replacing glade version + - Resolves bug #229849 Bug# 230115, Relates bug #221850: fix uuid code to resolve + '_uuid_generate_random' is not defined error + * Thu Feb 22 2007 Dan Walsh - 1.9.2-1 -- Suck in AuditMsg since audit libs are dropping support + - Suck in AuditMsg since audit libs are dropping support * Fri Feb 16 2007 Dan Walsh - 1.9.1-1 -- Split into server and gui packages + - Split into server and gui packages * Fri Feb 16 2007 Dan Walsh - 1.8.19-1 -- Remove use of ctypes in uuid, which is causing bad avc messages + - Remove use of ctypes in uuid, which is causing bad avc messages * Fri Feb 9 2007 Dan Walsh - 1.8.18-1 - - Remove avc from Plugin.py -p + - Remove avc from Plugin.py + * Wed Feb 7 2007 Dan Walsh - 1.8.17-1 - - Remove tempfile handling in util.py. Causes lots of avc's and is not used + - Remove tempfile handling in util.py. Causes lots of avc's and is not used * Fri Feb 2 2007 John Dennis - 1.8.16-1 [John Dennis ] Index: sources =================================================================== RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- sources 22 Feb 2007 19:11:37 -0000 1.78 +++ sources 5 Mar 2007 23:38:14 -0000 1.79 @@ -1 +1 @@ -cab2d8a610442ccfe44102182b9f9480 setroubleshoot-1.9.2.tar.gz +e33375c4fe69fce41fed1dc21450542e setroubleshoot-1.9.3.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 6 01:58:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 20:58:30 -0500 Subject: rpms/mlocate/devel .cvsignore, 1.5, 1.6 mlocate.spec, 1.11, 1.12 sources, 1.5, 1.6 updatedb.conf, 1.2, 1.3 Message-ID: <200703060158.l261wUFw004481@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/mlocate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4463 Modified Files: .cvsignore mlocate.spec sources updatedb.conf Log Message: * Tue Mar 6 2007 Miloslav Trmac - 0.16-1 - Update to mlocate-0.16 - Enable PRUNE_BIND_MOUNTS by default Resolves: #221755 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Nov 2006 03:01:57 -0000 1.5 +++ .cvsignore 6 Mar 2007 01:58:28 -0000 1.6 @@ -1 +1 @@ -mlocate-0.15.tar.gz +mlocate-0.16.tar.bz2 Index: mlocate.spec =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/mlocate.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mlocate.spec 5 Jan 2007 00:59:37 -0000 1.11 +++ mlocate.spec 6 Mar 2007 01:58:28 -0000 1.12 @@ -1,10 +1,10 @@ Summary: An utility for finding files by name Name: mlocate -Version: 0.15 -Release: 2 +Version: 0.16 +Release: 1 License: GPLv2 Group: Applications/System -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 Source1: updatedb.conf Source2: mlocate.cron BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -66,6 +66,11 @@ %ghost /var/lib/mlocate/mlocate.db %changelog +* Tue Mar 6 2007 Miloslav Trmac - 0.16-1 +- Update to mlocate-0.16 +- Enable PRUNE_BIND_MOUNTS by default + Resolves: #221755 + * Fri Jan 5 2007 Miloslav Trmac - 0.15-2 - Add gfs and gfs2 to PRUNEFS Resolves: #220491 Index: sources =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Nov 2006 03:01:57 -0000 1.5 +++ sources 6 Mar 2007 01:58:28 -0000 1.6 @@ -1 +1 @@ -e650c1ec5e180c982c9f52ca9a289d61 mlocate-0.15.tar.gz +4840542d9732eda6f41d4cd936852887 mlocate-0.16.tar.bz2 Index: updatedb.conf =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/updatedb.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- updatedb.conf 5 Jan 2007 00:59:37 -0000 1.2 +++ updatedb.conf 6 Mar 2007 01:58:28 -0000 1.3 @@ -1,2 +1,3 @@ +PRUNE_BIND_MOUNTS = "yes" 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 Tue Mar 6 03:07:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 5 Mar 2007 22:07:17 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.381, 1.382 anaconda.spec, 1.508, 1.509 sources, 1.505, 1.506 Message-ID: <200703060307.l2637HgL029896@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29813/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.30-1 on branch devel from anaconda-11.2.0.30-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.381 retrieving revision 1.382 diff -u -r1.381 -r1.382 --- .cvsignore 5 Mar 2007 22:47:25 -0000 1.381 +++ .cvsignore 6 Mar 2007 03:07:15 -0000 1.382 @@ -1 +1 @@ -anaconda-11.2.0.29.tar.bz2 +anaconda-11.2.0.30.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.508 retrieving revision 1.509 diff -u -r1.508 -r1.509 --- anaconda.spec 5 Mar 2007 22:47:25 -0000 1.508 +++ anaconda.spec 6 Mar 2007 03:07:15 -0000 1.509 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.29 +Version: 11.2.0.30 Release: 1 License: GPL Summary: Graphical system installer @@ -113,6 +113,10 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Mar 5 2007 Jeremy Katz - 11.2.0.30-1 +- ext2 is a module now +- add a basic boot drive selector to the graphical autopartitioning screen + * Mon Mar 5 2007 Jeremy Katz - 11.2.0.29-1 - Fix some typos (clumens, dcantrell, katzj) - Use depsolving from yum instead of our own stuff now that the yum Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.505 retrieving revision 1.506 diff -u -r1.505 -r1.506 --- sources 5 Mar 2007 22:47:25 -0000 1.505 +++ sources 6 Mar 2007 03:07:15 -0000 1.506 @@ -1 +1 @@ -04d921c05ca5ba3e94dbe19586151e7b anaconda-11.2.0.29.tar.bz2 +140941d3caa5ae250f0a452c7f8636a0 anaconda-11.2.0.30.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 6 07:42:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 02:42:40 -0500 Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.29,1.30 Message-ID: <200703060742.l267gekM003522@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/man-pages-fr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3506 Modified Files: man-pages-fr.spec Log Message: Update spec for merge review. Index: man-pages-fr.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- man-pages-fr.spec 14 Nov 2006 08:33:21 -0000 1.29 +++ man-pages-fr.spec 6 Mar 2007 07:42:37 -0000 1.30 @@ -1,14 +1,14 @@ Summary: French man pages from the Linux Documentation Project Name: man-pages-fr Version: 2.39 -Release: 7%{?dist} +Release: 8%{?dist} License: Distributable Group: Documentation URL: http://manpagesfr.free.fr/ Source0: http://manpagesfr.free.fr/download/%{name}-%{version}.tar.bz2 Source1: http://www.delafond.org/traducmanfr/mansupfr.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch %description Manual pages from the Linux Documentation Project, translated into French. Also @@ -35,22 +35,22 @@ # gawk haven't coding, but it's in latin1 for i in man?/*; do - CODING=`file -i ${i} | cut -d"=" -f2`; - if [[ "${CODING}" == "utf-8" || "${CODING}" == "us-ascii" || "${CODING}" == "iso-8859-1" ]] - then - if [ "${CODING}" != "UTF-8" ] - then - iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new - install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i} - rm -rf ${i}.new - else - install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i} - fi - else - iconv -f LATIN1 -t UTF-8 < ${i} > ${i}.new - install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i} - rm -rf ${i}.new - fi + CODING=`file -i ${i} | cut -d"=" -f2`; + if [[ "${CODING}" == "utf-8" || "${CODING}" == "us-ascii" || "${CODING}" == "iso-8859-1" ]] + then + if [ "${CODING}" != "UTF-8" ] + then + iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new + install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i} + rm -rf ${i}.new + else + install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i} + fi + else + iconv -f LATIN1 -t UTF-8 < ${i} > ${i}.new + install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i} + rm -rf ${i}.new + fi done ##make install-install DESTDIR=$RPM_BUILD_ROOT @@ -101,10 +101,13 @@ %files %defattr(0644,root,root,0755) %doc changements changements.anciens LISEZ_MOI LISEZ_MOI-mansupfr -##%doc Changements Changements.anciens Lisez_moi %{_mandir}/fr/ %changelog +* Mon Mar 05 2007 Marcela Maslanova 2.39-8 +- merge review +- rhbz#230061 + * Mon Oct 13 2006 Marcela Maslanova 2.39-7 - rebuilt From fedora-cvs-commits at redhat.com Tue Mar 6 08:18:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 03:18:44 -0500 Subject: rpms/htdig/FC-6 htdig.spec,1.32,1.33 Message-ID: <200703060818.l268Iixr017146@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/htdig/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv6218/htdig/FC-6 Modified Files: htdig.spec Log Message: removed sigfault patch from FC-6 branch Index: htdig.spec =================================================================== RCS file: /cvs/dist/rpms/htdig/FC-6/htdig.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- htdig.spec 20 Dec 2006 14:39:13 -0000 1.32 +++ htdig.spec 6 Mar 2007 08:18:42 -0000 1.33 @@ -5,7 +5,7 @@ Summary: ht://Dig - Web search engine Name: htdig Version: 3.2.0b6 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 3 License: GPL Group: Applications/Internet @@ -23,7 +23,6 @@ Patch7: htdig-3.2.0b-versioncheck.patch Patch8: htdig-3.2.0b6-compile-fix.patch Patch9: htdig-3.2.0b6-opts.patch -Patch10: htdig-3.2.0b6-sigfault.patch BuildRequires: flex >= 2.5.4a-13 BuildRequires: zlib-devel httpd openssl-devel BuildRoot: %{_tmppath}/%{name}-root @@ -76,7 +75,6 @@ %patch7 -p1 -b .versioncheck %patch8 -p1 -b .compile-fix %patch9 -p1 -b .opts -%patch10 -p1 -b .sigfault %build %configure \ @@ -147,6 +145,9 @@ %endif %changelog +* Tue Mar 06 2007 Adam Tkac 3:3.2.0b6-8.fc6 +- fired away sigfault patch because it causes sigfaults :) (#230931) + * Wed Dec 20 2006 Adam Tkac 3:3.2.0b6-7.fc6 - fixed htfuzzy's sigfaults (#130528) From fedora-cvs-commits at redhat.com Tue Mar 6 10:02:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 05:02:18 -0500 Subject: rpms/cairo/devel .cvsignore, 1.27, 1.28 cairo.spec, 1.68, 1.69 sources, 1.27, 1.28 Message-ID: <200703061002.l26A2Ias025620@cvs.devel.redhat.com> Author: cworth Update of /cvs/dist/rpms/cairo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25604 Modified Files: .cvsignore cairo.spec sources Log Message: update to 1.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 14 Feb 2007 08:59:24 -0000 1.27 +++ .cvsignore 6 Mar 2007 10:02:15 -0000 1.28 @@ -1 +1 @@ -cairo-1.3.14.tar.gz +cairo-1.4.0.tar.gz Index: cairo.spec =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- cairo.spec 14 Feb 2007 08:59:24 -0000 1.68 +++ cairo.spec 6 Mar 2007 10:02:15 -0000 1.69 @@ -3,10 +3,10 @@ Summary: A vector graphics library Name: cairo -Version: 1.3.14 +Version: 1.4.0 Release: 1%{?dist} URL: http://cairographics.org -Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz +Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz License: LGPL/MPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -86,6 +86,9 @@ %{_datadir}/gtk-doc/html/cairo %changelog +* Tue Mar 6 2007 Carl Worth 1.4.0-1 +- Update to 1.4.0 + * Wed Feb 14 2007 Carl Worth 1.3.14-1 - Update to 1.3.14 Index: sources =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 14 Feb 2007 08:59:24 -0000 1.27 +++ sources 6 Mar 2007 10:02:15 -0000 1.28 @@ -1 +1 @@ -08eef0800258bff5b3f13d787dd68402 cairo-1.3.14.tar.gz +b0882df4621bcf5b69f024b9475f8d4e cairo-1.4.0.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 6 10:04:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 05:04:22 -0500 Subject: rpms/ttcp/devel ttcp.spec,1.15,1.16 Message-ID: <200703061004.l26A4MAZ025695@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/ttcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25681 Modified Files: ttcp.spec Log Message: Update spec for merge review. Index: ttcp.spec =================================================================== RCS file: /cvs/dist/rpms/ttcp/devel/ttcp.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ttcp.spec 12 Jul 2006 08:33:48 -0000 1.15 +++ ttcp.spec 6 Mar 2007 10:04:20 -0000 1.16 @@ -1,15 +1,16 @@ Name: ttcp Version: 1.12 -Release: 14.1 +Release: 15%{?dist} +URL: ftp://ftp.sgi.com/sgi/src/ttcp/ Source0: ftp://ftp.sgi.com/sgi/src/ttcp/ttcp.c Source1: ftp://ftp.sgi.com/sgi/src/ttcp/ttcp.1 Source2: ftp://ftp.sgi.com/sgi/src/ttcp/README Patch0: ttcp-big.patch Patch1: ttcp-malloc.patch -Summary: A tool for testing TCP connections. +Summary: A tool for testing TCP connections Group: Applications/Internet License: Public Domain -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description ttcp is a tool for testing the throughput of TCP connections. Unlike other @@ -18,7 +19,7 @@ more accurate results. %prep -%setup -c -T +%setup -c -T -q cp %{SOURCE0} %{SOURCE1} %{SOURCE2} . %patch0 -p1 -b .big %patch1 -p1 -b .malloc @@ -37,12 +38,16 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc README %{_bindir}/* %{_mandir}/*/* %changelog +* Tue Mar 06 2007 Marcela Maslanova - 1.12-15 +- merge review +- rhbz#226505 + * Wed Jul 12 2006 Jesse Keating - 1.12-14.1 - rebuild From fedora-cvs-commits at redhat.com Tue Mar 6 10:50:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 05:50:18 -0500 Subject: rpms/gnome-user-share/devel .cvsignore, 1.6, 1.7 gnome-user-share.spec, 1.18, 1.19 sources, 1.6, 1.7 Message-ID: <200703061050.l26AoIC2024216@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/gnome-user-share/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23388 Modified Files: .cvsignore gnome-user-share.spec sources Log Message: * Tue Mar 6 2007 Alexander Larsson - 0.11-1 - Update to 0.11 with xdg-user-dirs support Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-user-share/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Apr 2006 16:53:02 -0000 1.6 +++ .cvsignore 6 Mar 2007 10:50:16 -0000 1.7 @@ -1,5 +1 @@ -gnome-user-share-0.6.tar.gz -gnome-user-share-0.7.tar.gz -gnome-user-share-0.8.tar.gz -gnome-user-share-0.9.tar.gz -gnome-user-share-0.10.tar.bz2 +gnome-user-share-0.11.tar.bz2 Index: gnome-user-share.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gnome-user-share.spec 24 Jan 2007 15:08:07 -0000 1.18 +++ gnome-user-share.spec 6 Mar 2007 10:50:16 -0000 1.19 @@ -1,13 +1,12 @@ Summary: Gnome user file sharing Name: gnome-user-share -Version: 0.10 -Release: 6%{?dist} +Version: 0.11 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 # 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 @@ -27,7 +26,6 @@ %prep %setup -q -%patch0 -p1 -b .category %build %configure @@ -77,6 +75,9 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Tue Mar 6 2007 Alexander Larsson - 0.11-1 +- Update to 0.11 with xdg-user-dirs support + * Wed Jan 24 2007 Matthias Clasen 0.10-6 - Add better categories to the desktop file Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-user-share/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Apr 2006 16:53:02 -0000 1.6 +++ sources 6 Mar 2007 10:50:16 -0000 1.7 @@ -1 +1 @@ -66d60061041e668e6ec7334d081bfc13 gnome-user-share-0.10.tar.bz2 +4961e49c858fbb7d6050c62a73286d74 gnome-user-share-0.11.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 6 11:21:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 06:21:08 -0500 Subject: rpms/diffstat/devel diffstat.spec,1.19,1.20 Message-ID: <200703061121.l26BL8Qq021630@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/diffstat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21575 Modified Files: diffstat.spec Log Message: * Tue Mar 6 2007 Tim Waugh 1.43-2 - Fixed buildroot (bug #225695). - Build should not require gzip or bzip2 as these are exceptions (bug #225695). - Added SMP make flags (bug #225695). - Avoid makeinstall macro (bug #225695). - Better defattr (bug #225695). - Fixed summary (bug #225695). - Avoid macros in changelog (bug #225695). - Resolves: rhbz#225695 rhbz#225695 rhbz#225695 rhbz#225695 rhbz#225695 rhbz#225695 rhbz#225695 Index: diffstat.spec =================================================================== RCS file: /cvs/dist/rpms/diffstat/devel/diffstat.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- diffstat.spec 11 Jan 2007 14:12:23 -0000 1.19 +++ diffstat.spec 6 Mar 2007 11:21:05 -0000 1.20 @@ -1,15 +1,13 @@ -Summary: A utility which provides statistics based on the output of diff. +Summary: A utility which provides statistics based on the output of diff Name: diffstat Version: 1.43 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: distributable URL: http://invisible-island.net/diffstat +# Note that the upstream tarball is unversioned, just %{name}.tar.gz Source: ftp://invisible-island.net/diffstat/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root - -# Autoconf tests check for these. -BuildRequires: gzip, bzip2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The diff command compares files line by line. Diffstat reads the @@ -25,21 +23,30 @@ %build %configure -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall mandir=$RPM_BUILD_ROOT%{_mandir} +make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/diffstat %{_mandir}/*/* %changelog +* Tue Mar 6 2007 Tim Waugh 1.43-2 +- Fixed buildroot (bug #225695). +- Build should not require gzip or bzip2 as these are exceptions (bug #225695). +- Added SMP make flags (bug #225695). +- Avoid makeinstall macro (bug #225695). +- Better defattr (bug #225695). +- Fixed summary (bug #225695). +- Avoid macros in changelog (bug #225695). + * Thu Jan 11 2007 Tim Waugh 1.43-1 - 1.43. Fixes bug #187350. No longer need compress patch. @@ -108,7 +115,7 @@ * Wed May 31 2000 Ngo Than - rebuild for 7.0 - put man page in /usr/share/man/* -- use %configure +- use %%configure - fix makefile.in - cleanup specfile From fedora-cvs-commits at redhat.com Tue Mar 6 11:28:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 06:28:47 -0500 Subject: rpms/sysreport/devel .cvsignore, 1.29, 1.30 sources, 1.32, 1.33 sysreport.spec, 1.40, 1.41 Message-ID: <200703061128.l26BSlGZ027243@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/sysreport/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27166 Modified Files: .cvsignore sources sysreport.spec Log Message: Getting information about printcap Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sysreport/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 14 Aug 2006 09:53:53 -0000 1.29 +++ .cvsignore 6 Mar 2007 11:28:45 -0000 1.30 @@ -15,3 +15,4 @@ sysreport-1.4.3-6.tar.bz2 sysreport-1.4.3-8.tar.bz2 sysreport-1.4.3-9.tar.bz2 +sysreport-1.4.3-10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/sysreport/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 14 Aug 2006 09:53:53 -0000 1.32 +++ sources 6 Mar 2007 11:28:45 -0000 1.33 @@ -1 +1 @@ -5d7db2140b3dfe1e8fb7198e53fb1ded sysreport-1.4.3-9.tar.bz2 +bb3b98e7ff52cb9d03dac3713d743bd7 sysreport-1.4.3-10.tar.bz2 Index: sysreport.spec =================================================================== RCS file: /cvs/dist/rpms/sysreport/devel/sysreport.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sysreport.spec 14 Aug 2006 09:53:53 -0000 1.40 +++ sysreport.spec 6 Mar 2007 11:28:45 -0000 1.41 @@ -1,13 +1,13 @@ Summary: Gathers system hardware and configuration information. Name: sysreport Version: 1.4.3 -Release: 9 +Release: 10 URL: http://www.redhat.com/support Group: Development/Debuggers Source0: %{name}-%{version}-%{release}.tar.bz2 License: GPL BuildArchitectures: noarch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: bash gawk grep sed mktemp Requires: /usr/bin/tr @@ -42,6 +42,9 @@ %{_mandir}/man1/* %changelog +* Tue Mar 06 2007 Than Ngo - 1.4.3-10 +- Getting information about printcap + * Mon Aug 14 2006 Than Ngo 1.4.3-9 - fix #195352, sysreport's is returning a return code of 255 vice 0 From fedora-cvs-commits at redhat.com Tue Mar 6 13:12:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 08:12:04 -0500 Subject: rpms/kdebase/devel kdebase.spec,1.240,1.241 Message-ID: <200703061312.l26DC4ug018374@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18216 Modified Files: kdebase.spec Log Message: cleanup specfile Index: kdebase.spec =================================================================== RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- kdebase.spec 14 Feb 2007 17:33:08 -0000 1.240 +++ kdebase.spec 6 Mar 2007 13:12:02 -0000 1.241 @@ -18,7 +18,7 @@ Summary: K Desktop Environment - core files Name: kdebase Version: 3.5.6 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 6 Url: http://www.kde.org Group: User Interface/Desktops @@ -78,6 +78,7 @@ Requires: cdparanoia-libs Requires: pam >= 0.79-6 Requires: htdig +Requires: psmisc %ifarch %{ix86} x86_64 ia64 ppc ppc64 Requires: pm-utils %endif @@ -392,7 +393,6 @@ %{_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 @@ -401,7 +401,6 @@ %{_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) @@ -552,6 +551,9 @@ %exclude %{_libdir}/libkdeinit_*.so %changelog +* Tue Mar 06 2007 Than Ngo - 6:3.5.6-3.fc7 +- cleanup specfile + * Wed Feb 14 2007 Than Ngo - 6:3.5.6-2.fc7 - make konsole binary sgid utempter #213369 From fedora-cvs-commits at redhat.com Tue Mar 6 13:23:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 08:23:33 -0500 Subject: rpms/nautilus/devel nautilus-xdg-user-dirs.patch, 1.1, 1.2 nautilus.spec, 1.144, 1.145 Message-ID: <200703061323.l26DNXdV019452@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19405 Modified Files: nautilus-xdg-user-dirs.patch nautilus.spec Log Message: * Tue Mar 6 2007 Alexander Larsson - 2.17.92-3 - Update xdg-user-dirs patch, now handle renaming desktop dir nautilus-xdg-user-dirs.patch: libnautilus-private/nautilus-file-utilities.c | 298 +++++++++++++++++++++++++- libnautilus-private/nautilus-file-utilities.h | 2 libnautilus-private/nautilus-file.c | 1 libnautilus-private/nautilus-signaller.c | 9 src/file-manager/fm-directory-view.c | 103 ++++++-- 5 files changed, 380 insertions(+), 33 deletions(-) Index: nautilus-xdg-user-dirs.patch =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus-xdg-user-dirs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nautilus-xdg-user-dirs.patch 2 Mar 2007 15:06:35 -0000 1.1 +++ nautilus-xdg-user-dirs.patch 6 Mar 2007 13:23:31 -0000 1.2 @@ -1,6 +1,6 @@ Index: src/file-manager/fm-directory-view.c =================================================================== ---- src/file-manager/fm-directory-view.c (revision 12767) +--- src/file-manager/fm-directory-view.c (revision 12790) +++ src/file-manager/fm-directory-view.c (working copy) @@ -151,6 +151,7 @@ #define FM_DIRECTORY_VIEW_POPUP_PATH_LOCATION "/location" @@ -214,9 +214,21 @@ } +Index: libnautilus-private/nautilus-file.c +=================================================================== +--- libnautilus-private/nautilus-file.c (revision 12790) ++++ libnautilus-private/nautilus-file.c (working copy) +@@ -839,7 +839,6 @@ nautilus_file_can_rename (NautilusFile * + } + + if ((is_desktop_file (file) && !can_rename_desktop_file (file)) || +- nautilus_file_is_desktop_directory (file) || + nautilus_file_is_home (file)) { + return FALSE; + } Index: libnautilus-private/nautilus-file-utilities.c =================================================================== ---- libnautilus-private/nautilus-file-utilities.c (revision 12767) +--- libnautilus-private/nautilus-file-utilities.c (revision 12790) +++ libnautilus-private/nautilus-file-utilities.c (working copy) @@ -31,6 +31,7 @@ #include "nautilus-metafile.h" @@ -226,15 +238,18 @@ #include #include #include -@@ -49,6 +50,7 @@ +@@ -49,6 +50,10 @@ #define LEGACY_DESKTOP_DIRECTORY_NAME ".gnome-desktop" #define DEFAULT_DESKTOP_DIRECTORY_MODE (0755) +static void update_xdg_dir_cache (void); ++static void schedule_user_dirs_changed (void); ++static void desktop_dir_changed (void); ++ char * nautilus_compute_title_for_uri (const char *text_uri) -@@ -148,15 +150,277 @@ nautilus_get_user_directory (void) +@@ -148,15 +153,280 @@ nautilus_get_user_directory (void) return user_directory; } @@ -384,6 +399,8 @@ + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, + NULL, NULL, NULL, NULL); ++ schedule_user_dirs_changed (); ++ desktop_dir_changed (); + } + } + g_free (file_uri); @@ -445,6 +462,7 @@ + g_free (cached_xdg_dirs); + + schedule_user_dirs_changed (); ++ desktop_dir_changed (); + } + + if (!started_monitor) { @@ -514,7 +532,7 @@ } /** -@@ -231,11 +495,22 @@ nautilus_get_home_directory_uri (void) +@@ -231,11 +501,22 @@ nautilus_get_home_directory_uri (void) } @@ -539,9 +557,33 @@ } void +@@ -283,8 +564,9 @@ static char *escaped_desktop_dir_dirname + static char *escaped_desktop_dir_filename = NULL; + static gboolean desktop_dir_changed_callback_installed = FALSE; + ++ + static void +-desktop_dir_changed_callback (gpointer callback_data) ++desktop_dir_changed (void) + { + g_free (escaped_desktop_dir); + g_free (escaped_desktop_dir_filename); +@@ -295,6 +577,12 @@ desktop_dir_changed_callback (gpointer c + } + + static void ++desktop_dir_changed_callback (gpointer callback_data) ++{ ++ desktop_dir_changed (); ++} ++ ++static void + update_desktop_dir (void) + { + char *uri, *path; Index: libnautilus-private/nautilus-file-utilities.h =================================================================== ---- libnautilus-private/nautilus-file-utilities.h (revision 12767) +--- libnautilus-private/nautilus-file-utilities.h (revision 12790) +++ libnautilus-private/nautilus-file-utilities.h (working copy) @@ -37,6 +37,7 @@ gboolean nautilus_file_name_matches_back /* These functions all return something something that needs to be @@ -561,7 +603,7 @@ void nautilus_create_templates_directory (void); Index: libnautilus-private/nautilus-signaller.c =================================================================== ---- libnautilus-private/nautilus-signaller.c (revision 12767) +--- libnautilus-private/nautilus-signaller.c (revision 12790) +++ libnautilus-private/nautilus-signaller.c (working copy) @@ -39,6 +39,7 @@ enum { HISTORY_LIST_CHANGED, Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- nautilus.spec 2 Mar 2007 15:06:35 -0000 1.144 +++ nautilus.spec 6 Mar 2007 13:23:31 -0000 1.145 @@ -19,7 +19,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME Version: 2.17.92 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2 @@ -210,6 +210,9 @@ %{_libdir}/*.so %changelog +* Tue Mar 6 2007 Alexander Larsson - 2.17.92-3 +- Update xdg-user-dirs patch, now handle renaming desktop dir + * Thu Mar 1 2007 Alexander Larsson - 2.17.92-2 - Add xdg-user-dirs patch From fedora-cvs-commits at redhat.com Tue Mar 6 13:48:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 08:48:44 -0500 Subject: rpms/at/FC-6 at-3.1.8-debug.patch,NONE,1.1 at.spec,1.42,1.43 Message-ID: <200703061348.l26Dmio3007898@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/at/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv24471 Modified Files: at.spec Added Files: at-3.1.8-debug.patch Log Message: Add patch for debug. at-3.1.8-debug.patch: Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE at-3.1.8-debug.patch --- --- at-3.1.8/Makefile.in.debug 2007-02-23 10:28:25.000000000 +0100 +++ at-3.1.8/Makefile.in 2007-03-06 14:37:42.000000000 +0100 @@ -109,14 +109,14 @@ chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) 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) -d -m 755 $(IROOT)$(man1dir) $(INSTALL) -d -m 755 $(IROOT)$(man5dir) $(INSTALL) -d -m 755 $(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 Index: at.spec =================================================================== RCS file: /cvs/dist/rpms/at/FC-6/at.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- at.spec 30 Jan 2007 10:35:18 -0000 1.42 +++ at.spec 6 Mar 2007 13:48:41 -0000 1.43 @@ -41,6 +41,8 @@ Patch34: at-3.1.8-install_no_chown.patch Patch35: at-3.1.8-dontfork.patch Patch36: at-3.1.8-daylight.patch +Patch37: at-3.1.8-debug.patch + Prereq: fileutils chkconfig /etc/init.d BuildPrereq: flex bison autoconf BuildPrereq: libselinux-devel >= 1.27.9 @@ -109,6 +111,7 @@ %patch34 -p1 -b .install_no_chown %patch35 -p1 -b .dontfork %patch36 -p1 -b .daylight +%patch37 -p1 -b .debug %build # patch10 touches configure.in @@ -122,8 +125,6 @@ --with-selinux \ %if %{WITH_PAM} --with-pam -%else - %endif make From fedora-cvs-commits at redhat.com Tue Mar 6 13:58:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 08:58:59 -0500 Subject: rpms/php-pear/devel php-pear.spec,1.20,1.21 Message-ID: <200703061358.l26DwxBS017726@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php-pear/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17712 Modified Files: php-pear.spec Log Message: * Tue Mar 6 2007 Joe Orton 1:1.5.0-3 - add redundant build section (#226295) - BR php-cli not php (#226295) Index: php-pear.spec =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- php-pear.spec 19 Feb 2007 18:57:03 -0000 1.20 +++ php-pear.spec 6 Mar 2007 13:58:57 -0000 1.21 @@ -10,7 +10,7 @@ Summary: PHP Extension and Application Repository framework Name: php-pear Version: 1.5.0 -Release: 2 +Release: 3 Epoch: 1 License: The PHP License v3.0 Group: Development/Languages @@ -26,7 +26,7 @@ Source20: http://pear.php.net/get/XML_RPC-%{xmlrpcver}.tgz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: php >= 5.1.0-1, gnupg +BuildRequires: php-cli >= 5.1.0-1, gnupg Provides: php-pear(Archive_Tar) = 1.3.2 Provides: php-pear(Console_Getopt) = 1.2.1 Provides: php-pear(PEAR) = %{version} @@ -41,6 +41,9 @@ %prep %setup -cTn pear-%{version} +%build +# This is an empty build section. + %install rm -rf $RPM_BUILD_ROOT @@ -114,6 +117,10 @@ %doc LICENSE %changelog +* Tue Mar 6 2007 Joe Orton 1:1.5.0-3 +- add redundant build section (#226295) +- BR php-cli not php (#226295) + * Mon Feb 19 2007 Joe Orton 1:1.5.0-2 - update builtin module provides (Remi Collet, #226295) - drop patch 0 From fedora-cvs-commits at redhat.com Tue Mar 6 14:21:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 09:21:37 -0500 Subject: rpms/kdeedu/devel kdeedu.spec,1.54,1.55 Message-ID: <200703061421.l26ELbiL011265@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeedu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11251 Modified Files: kdeedu.spec Log Message: cleanup Index: kdeedu.spec =================================================================== RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- kdeedu.spec 7 Feb 2007 22:54:49 -0000 1.54 +++ kdeedu.spec 6 Mar 2007 14:21:34 -0000 1.55 @@ -1,58 +1,56 @@ +%define rhel 0 + %define debug 0 %define final 0 %define make_cvs 1 -%define arts 1 - -%define qt_version 3.3.7 %define kdelibs_epoch 6 -%define kdebase_epoch 6 -%define qt_epoch 1 Name: kdeedu Version: 3.5.6 -Release: 1%{?dist} -Summary: Educational/Edutainment applications for KDE +Release: 2%{?dist} +Summary: Educational/Edutainment applications +Group: Amusements/Games URL: http://www.kde.org/ License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Group: User Interface/Desktops -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 -Requires: kdebase >= %{kdebase_epoch}:%{version} -Requires: qt >= %{qt_epoch}:%{qt_version} +Requires: kdelibs >= %{kdelibs_epoch}:%{version} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -BuildRequires: kdebase-devel -BuildRequires: perl +BuildRequires: desktop-file-utils +BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version} +BuildRequires: python-devel python +BuildRequires: boost-devel +%if %{make_cvs} BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: gettext -BuildRequires: python-devel -BuildRequires: boost-devel - -Obsoletes: keduca -Obsoletes: kig -Obsoletes: klettres -Obsoletes: kmessedwords -Obsoletes: kstars -Obsoletes: ktouch -Obsoletes: kvoctrain - -Provides: keduca -Provides: kig -Provides: klettres -Provides: kmessedwords -Provides: kstars -Provides: ktouch -Provides: kvoctrain +%endif %description -Educational/Edutainment applications for KDE +Educational/Edutainment applications, including: +* blinken: Simon Says Game +* kalzium: Periodic Table of Elements +* kanagram: Letter Order Game +* kbruch: Exercise Fractions +* keduca: Tests and Exams +* kgeography: Geography Trainer +* khangman: Hangman Game +* kig: Interactive Geometry +* kiten: Japanese Reference/Study Tool +* klatin: Latin Reviser +* klettres: French alphabet tutor +* kmplot: Mathematical Function Plotter +* kpercentage: Excersie Percentages +* kstars: Desktop Planetarium +* ktouch: Touch Typing Tutor +* kturtle: Logo Programming Environment +* kverbos: Study Spanish Verbforms +* kvoctrain: Vocabulary Trainer +* kwordquiz: Vocabulary Trainer %package devel Summary: Header files for kdeedu @@ -65,13 +63,10 @@ %prep %setup -q -%ifarch s390 s390x ppc ppc64 - rm -rf doc/kstars kstars - perl -pi -e "s|kstars||" subdirs -%endif - +%if %{rhel} rm -rf doc/kgeography kgeography perl -pi -e "s|kgeography||" subdirs +%endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -86,9 +81,6 @@ --disable-rpath \ --enable-kig-python-scripting \ --disable-gcc-hidden-visibility \ -%if %{arts} == 0 - --without-arts \ -%endif %if %{debug} == 0 --disable-debug \ --disable-warnings \ @@ -96,8 +88,7 @@ %if %{final} --enable-final \ %endif - --includedir=%{_includedir}/kde \ - --with-qt-libraries=$QTDIR/lib + --includedir=%{_includedir}/kde make %{?_smp_mflags} @@ -106,48 +97,87 @@ make install DESTDIR=%{buildroot} +ktop-file-install \ + --vendor="" \ + --dir %{buildroot}%{_datadir}/applications/kde \ + --add-category="Qt" \ + --add-category="KDE" \ + --add-category="Education" \ + --add-category="X-KDE-Edu-Language" \ + --delete-original \ + %{buildroot}%{_datadir}/applnk/Edutainment/*/kwordquiz.desktop + +# locale's +%find_lang %{name} || touch %{name}.lang +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +# rpmdocs +for dir in blinken k* ; do + for file in AUTHORS ChangeLog README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + done +done + + %clean rm -rf %{buildroot} %post -/sbin/ldconfig -for f in crystalsvg hicolor locolor ; do - touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +/sbin/ldconfig ||: +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %postun -/sbin/ldconfig -for f in crystalsvg hicolor locolor ; do - touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - - -%files -%defattr(-,root,root) -%doc %{_docdir}/HTML/en/* +/sbin/ldconfig ||: +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc README COPYING +%doc rpmdocs/* %{_bindir}/* -%{_libdir}/*.so.* -%{_libdir}/*.la -%{_libdir}/kde3/* %{_datadir}/applications/kde/* -%{_datadir}/applnk/Edutainment/* +%{_datadir}/applnk/Edutainment/ %{_datadir}/apps/* -%{_datadir}/mimelnk/application/* -%{_datadir}/icons/*/*/*/* +%config %{_datadir}/config*/* +%{_datadir}/mimelnk/*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* %{_datadir}/services/* -%{_datadir}/config.kcfg/* -%{_datadir}/config/* +%{_libdir}/kde3/* +%{_libdir}/lib*.so.* +%{_libdir}/*.la %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc libkdeedu/AUTHORS libkdeedu/README %{_includedir}/kde/* %{_libdir}/*.so %changelog +* Tue Mar 06 2007 Than Ngo - 3.5.6-2.fc7 +- cleanup + * Wed Feb 07 2007 Than Ngo 3.5.6-1.fc7 - 3.5.6 From fedora-cvs-commits at redhat.com Tue Mar 6 14:34:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 09:34:42 -0500 Subject: rpms/kdeedu/devel kdeedu.spec,1.55,1.56 Message-ID: <200703061434.l26EYgPU026720@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeedu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25346 Modified Files: kdeedu.spec Log Message: typo Index: kdeedu.spec =================================================================== RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- kdeedu.spec 6 Mar 2007 14:21:34 -0000 1.55 +++ kdeedu.spec 6 Mar 2007 14:34:40 -0000 1.56 @@ -97,7 +97,7 @@ make install DESTDIR=%{buildroot} -ktop-file-install \ +desktop-file-install \ --vendor="" \ --dir %{buildroot}%{_datadir}/applications/kde \ --add-category="Qt" \ From fedora-cvs-commits at redhat.com Tue Mar 6 14:59:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 09:59:19 -0500 Subject: rpms/kdegames/devel .cvsignore, 1.35, 1.36 kdegames.spec, 1.56, 1.57 sources, 1.38, 1.39 kde-libtool.patch, 1.1, NONE Message-ID: <200703061459.l26ExJ4n005312@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdegames/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5210 Modified Files: .cvsignore kdegames.spec sources Removed Files: kde-libtool.patch Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdegames/devel/.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 6 Mar 2007 14:59:17 -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.tar.bz2 Index: kdegames.spec =================================================================== RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- kdegames.spec 7 Feb 2007 15:13:26 -0000 1.56 +++ kdegames.spec 6 Mar 2007 14:59:17 -0000 1.57 @@ -1,23 +1,19 @@ +%define rhel 0 + %define debug 0 %define final 0 -%define make_cvs 1 - -%define arts 1 -%define redhatify 1 +%define make_cvs 0 -%if %{redhatify} +%if %{rhel} %define patch_name -patched %else %define patch_name %{nil} %endif -%define qt_version 3.3.6 -%define qt_epoch 1 %define kdelibs_epoch 6 -%define kdebase_epoch 6 Version: 3.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 6 Summary: K Desktop Environment - Games Name: kdegames @@ -27,24 +23,18 @@ Url: http://www.kde.org Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2 -Patch2: kdegames-3.1.1-konquest.patch +Patch0: kdegames-3.1.1-konquest.patch Requires: kdelibs >= %{kdelibs_epoch}:%{version} -Requires: kdebase >= %{kdebase_epoch}:%{version} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: kdebase-devel +BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version} +%if %{make_cvs} BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version} -BuildRequires: perl +%endif %description Games and gaming libraries for the K Desktop Environment. @@ -56,7 +46,7 @@ Summary: Development files for kdegames Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: kdebase-devel >= %{kdebase_epoch}:%{version} +Requires: kdelibs-devel >= %{kdelibs_epoch}:%{version} %description devel Development files for the KDE gaming libraries. @@ -65,7 +55,8 @@ %prep %setup -q -n %{name}-%{version}%{patch_name} -%patch2 -p1 -b .konquest + +%patch0 -p1 -b .konquest %if %{make_cvs} make -f admin/Makefile.common cvs @@ -79,12 +70,6 @@ --disable-dependency-tracking \ --disable-rpath \ --disable-gcc-hidden-visibility \ -%if %{arts} == 0 - --without-arts \ -%endif -%ifarch s390 s390x - --disable-pie \ -%endif %if %{final} --enable-final \ %endif @@ -93,7 +78,7 @@ --disable-warnings \ %endif --includedir=%{_includedir}/kde \ - --with-qt-libraries=$QTDIR/lib + --disable-setgid make %{?_smp_mflags} @@ -102,58 +87,74 @@ make install DESTDIR=%{buildroot} -# Make symlinks relative -pushd %{buildroot}%{_docdir}/HTML/en -for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f %{buildroot}%{_docdir}/HTML/en/$i/common - ln -sf ../common %{buildroot}%{_docdir}/HTML/en/$i - fi +# locale's +%find_lang %{name} || touch %{name}.lang +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +# rpmdocs +for dir in k* lskat ; do + for file in AUTHORS ChangeLog README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + done done -popd %clean rm -rf %{buildroot} %post /sbin/ldconfig ||: -for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %postun /sbin/ldconfig ||: -for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - -%files -%defattr(-,root,root) -%doc %{_docdir}/HTML/en/* +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS README COPYING* +%doc rpmdocs/* %{_bindir}/* -%{_libdir}/*.so.* -%{_libdir}/*.la -%{_libdir}/libkdeinit_* -%{_libdir}/kde3/* -%{_datadir}/applications/kde/* +%{_datadir}/applications/kde/*.desktop %{_datadir}/apps/* -%{_datadir}/config.kcfg/* -%{_datadir}/config/* -%{_datadir}/icons/*/*/*/* -%{_datadir}/mimelnk/application/* -%{_datadir}/services/* +%config %{_datadir}/config*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/mimelnk/*/* +%{_datadir}/service*/* +%{_libdir}/kde3/* +%{_libdir}/lib*.so.* +%{_libdir}/libkdeinit_*.so +%{_libdir}/*.la %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc libkdegames/README libkdegames/TODO %{_includedir}/kde/* %{_libdir}/lib*.so -%exclude %{_libdir}/libkdeinit_* +%exclude %{_libdir}/libkdeinit_*.so %changelog +* Tue Mar 06 2007 Than Ngo - 6:3.5.6-2.fc7 +- cleanup + * Wed Feb 07 2007 Than Ngo 6:3.5.6-1.fc7 - 3.5.6 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdegames/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 7 Feb 2007 15:13:26 -0000 1.38 +++ sources 6 Mar 2007 14:59:17 -0000 1.39 @@ -1 +1 @@ -b9202b9d3fd07484cab1cb87cbab15d0 kdegames-3.5.6-patched.tar.bz2 +d6cdf7d9235896670d5299e9e91665e2 kdegames-3.5.6.tar.bz2 --- kde-libtool.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 6 15:23:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 10:23:37 -0500 Subject: rpms/libvte-java/devel libvte-java-gjavah.patch, NONE, 1.1 libvte-java.spec, 1.30, 1.31 libvte-java-javah.patch, 1.1, NONE Message-ID: <200703061523.l26FNbN8015671@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/libvte-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15643 Modified Files: libvte-java.spec Added Files: libvte-java-gjavah.patch Removed Files: libvte-java-javah.patch Log Message: - Rename the gcjh -> gjavah patch. libvte-java-gjavah.patch: configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE libvte-java-gjavah.patch --- --- ./configure.orig 2006-08-03 16:51:18.000000000 +0200 +++ ./configure 2007-03-05 20:35:59.366449000 +0100 @@ -22021,7 +22021,7 @@ -for ac_prog in "gcjh -jni" "javah" +for ac_prog in "gjavah -jni" "javah" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -22060,7 +22060,7 @@ test -n "$JAVAH" && break done -test -n "$JAVAH" || JAVAH="gcjh -jni" +test -n "$JAVAH" || JAVAH="gjavah -jni" ac_config_files="$ac_config_files Makefile" --- ./configure.ac.orig 2006-08-03 16:51:00.000000000 +0200 +++ ./configure.ac 2007-03-05 20:36:05.603202000 +0100 @@ -54,7 +54,7 @@ AC_SUBST(VTE_CFLAGS) AC_SUBST(VTE_LIBS) -AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni]) +AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([vte-java.pc]) Index: libvte-java.spec =================================================================== RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- libvte-java.spec 5 Mar 2007 19:39:19 -0000 1.30 +++ libvte-java.spec 6 Mar 2007 15:23:35 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Wrapper library for GNOME VTE Name: libvte-java Version: 0.12.1 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://java-gnome.sourceforge.net Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2 License: LGPL @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/libvte-java Patch: libvte-java-alias.patch -Patch1: libvte-java-javah.patch +Patch1: %{name}-gjavah.patch Requires: glib-java >= 0.2.4 Requires: libgtk-java >= 2.8.4 @@ -103,6 +103,9 @@ %{_datadir}/java/*.zip %changelog +* Tue Mar 6 2007 Stepan Kasal - 0.12.1-8 +- Rename the gcjh -> gjavah patch. + * Mon Mar 5 2007 Stepan Kasal - 0.12.1-7 - Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in after applying it. --- libvte-java-javah.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 6 15:32:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 10:32:10 -0500 Subject: rpms/libglade-java/devel libglade-java-gjavah.patch, NONE, 1.1 libglade-java-javah.patch, 1.1, NONE Message-ID: <200703061532.l26FWAtV021871@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/libglade-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21837 Added Files: libglade-java-gjavah.patch Removed Files: libglade-java-javah.patch Log Message: Rename the the filename of the gjavah patch. libglade-java-gjavah.patch: configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE libglade-java-gjavah.patch --- --- ./configure.ac.orig 2006-08-03 05:24:06.000000000 +0200 +++ ./configure.ac 2007-03-05 20:14:24.724384000 +0100 @@ -87,7 +87,7 @@ AC_SUBST(LIBGLADE_CFLAGS) AC_SUBST(LIBGLADE_LIBS) -AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni]) +AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([glade-java.pc]) --- ./configure.orig 2006-08-03 06:41:47.000000000 +0200 +++ ./configure 2007-03-05 20:14:10.064063000 +0100 @@ -22852,7 +22852,7 @@ -for ac_prog in "gcjh -jni" "javah" +for ac_prog in "gjavah -jni" "javah" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -22891,7 +22891,7 @@ test -n "$JAVAH" && break done -test -n "$JAVAH" || JAVAH="gcjh -jni" +test -n "$JAVAH" || JAVAH="gjavah -jni" ac_config_files="$ac_config_files Makefile" --- libglade-java-javah.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 6 15:32:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 10:32:18 -0500 Subject: rpms/bind/devel .cvsignore, 1.24, 1.25 bind-9.3.1-dbus_archdep_libdir.patch, 1.1, 1.2 bind-9.3.1-sdb_dbus.patch, 1.1, 1.2 bind-9.3.1rc1-sdb.patch, 1.2, 1.3 bind-9.3.2b1-PIE.patch, 1.1, 1.2 bind-9.3.3-edns.patch, 1.1, 1.2 bind-9.3.3rc2-dbus.patch, 1.1, 1.2 bind-9.3.3rc2-rndckey.patch, 1.1, 1.2 bind-bsdcompat.patch, 1.1, 1.2 bind-chroot-admin.in, 1.17, 1.18 bind.spec, 1.163, 1.164 sources, 1.31, 1.32 Message-ID: <200703061532.l26FWIg2021990@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21504/bind/devel Modified Files: .cvsignore bind-9.3.1-dbus_archdep_libdir.patch bind-9.3.1-sdb_dbus.patch bind-9.3.1rc1-sdb.patch bind-9.3.2b1-PIE.patch bind-9.3.3-edns.patch bind-9.3.3rc2-dbus.patch bind-9.3.3rc2-rndckey.patch bind-bsdcompat.patch bind-chroot-admin.in bind.spec sources Log Message: updated to 9.4.0 bind-chroot-admin now using restorecon instead chcon Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bind/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 25 Jan 2007 18:00:56 -0000 1.24 +++ .cvsignore 6 Mar 2007 15:32:16 -0000 1.25 @@ -1,3 +1,3 @@ -bind-9.3.4.tar.gz -bind-chroot.tar.gz +bind-9.4.0.tar.gz libbind-man.tar.gz +bind-chroot.tar.gz bind-9.3.1-dbus_archdep_libdir.patch: named/Makefile.in | 3 ++- named_sdb/Makefile.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) Index: bind-9.3.1-dbus_archdep_libdir.patch =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.1-dbus_archdep_libdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-9.3.1-dbus_archdep_libdir.patch 17 Aug 2005 03:08:27 -0000 1.1 +++ bind-9.3.1-dbus_archdep_libdir.patch 6 Mar 2007 15:32:16 -0000 1.2 @@ -1,26 +1,26 @@ ---- bind-9.3.1/bin/named_sdb/Makefile.in.dbus_archdep_libdir 2005-08-16 21:23:28.000000000 -0400 -+++ bind-9.3.1/bin/named_sdb/Makefile.in 2005-08-16 23:00:49.000000000 -0400 -@@ -35,8 +35,9 @@ - ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ +--- bind-9.4.0/bin/named/Makefile.in.dbus_archdep_libdir 2007-03-06 14:18:14.000000000 +0100 ++++ bind-9.4.0/bin/named/Makefile.in 2007-03-06 14:20:39.000000000 +0100 +@@ -43,8 +43,9 @@ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ - ${DBDRIVER_INCLUDES} + ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} + +DBUS_ARCHDEP_LIBDIR ?= lib DBUS_INCLUDES = \ -- -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 -+ -I/usr/${DBUS_ARCHDEP_LIBDIR}/dbus-1.0/include -I/usr/include/dbus-1.0 - CDEFINES = - CWARNINGS = - ---- bind-9.3.1/bin/named/Makefile.in.dbus_archdep_libdir 2005-08-16 21:23:28.000000000 -0400 -+++ bind-9.3.1/bin/named/Makefile.in 2005-08-16 23:00:58.000000000 -0400 -@@ -35,8 +35,9 @@ - ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ +- -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 ++ -I/usr/${DBUS_ARCHDEP_LIBDIR}/dbus-1.0/include -I/usr/include/dbus-1.0 + + CDEFINES = @USE_DLZ@ + +--- bind-9.4.0/bin/named_sdb/Makefile.in.dbus_archdep_libdir 2007-03-06 14:18:14.000000000 +0100 ++++ bind-9.4.0/bin/named_sdb/Makefile.in 2007-03-06 14:21:09.000000000 +0100 +@@ -43,8 +43,9 @@ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ - ${DBDRIVER_INCLUDES} + ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} + +DBUS_ARCHDEP_LIBDIR ?= lib DBUS_INCLUDES = \ -- -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 -+ -I/usr/${DBUS_ARCHDEP_LIBDIR}/dbus-1.0/include -I/usr/include/dbus-1.0 - CDEFINES = - CWARNINGS = +- -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 ++ -I/usr/${DBUS_ARCHDEP_LIBDIR}/dbus-1.0/include -I/usr/include/dbus-1.0 + + CDEFINES = @USE_DLZ@ bind-9.3.1-sdb_dbus.patch: Makefile.in | 13 ++++++++++++- main.c | 8 ++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) Index: bind-9.3.1-sdb_dbus.patch =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.1-sdb_dbus.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-9.3.1-sdb_dbus.patch 17 Aug 2005 02:29:53 -0000 1.1 +++ bind-9.3.1-sdb_dbus.patch 6 Mar 2007 15:32:16 -0000 1.2 @@ -1,16 +1,16 @@ ---- bind-9.3.1/bin/named_sdb/Makefile.in.sdb_dbus 2005-08-16 21:18:06.000000000 -0400 -+++ bind-9.3.1/bin/named_sdb/Makefile.in 2005-08-16 21:18:06.000000000 -0400 -@@ -35,7 +35,8 @@ - ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ +--- bind-9.4.0/bin/named_sdb/Makefile.in.sdb_dbus 2007-03-06 14:12:30.000000000 +0100 ++++ bind-9.4.0/bin/named_sdb/Makefile.in 2007-03-06 14:16:45.000000000 +0100 +@@ -43,6 +43,9 @@ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ - ${DBDRIVER_INCLUDES} -- + ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} + +DBUS_INCLUDES = \ -+ -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 - CDEFINES = - CWARNINGS = ++ -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 ++ + CDEFINES = @USE_DLZ@ -@@ -52,6 +53,7 @@ + CWARNINGS = +@@ -60,6 +63,7 @@ ISCDEPLIBS = ../../lib/isc/libisc. at A@ LWRESDEPLIBS = ../../lib/lwres/liblwres. at A@ BIND9DEPLIBS = ../../lib/bind9/libbind9. at A@ @@ -18,25 +18,23 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \ ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS} -@@ -70,7 +72,8 @@ - tkeyconf.o tsigconf.o update.o xfrout.o \ +@@ -80,6 +84,7 @@ zoneconf.o \ lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \ -- lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \ -+ lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \ + lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \ + dbus_service.o dbus_mgr.o \ - $(DBDRIVER_OBJS) + ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS} UOBJS = unix/os.o -@@ -83,6 +86,7 @@ +@@ -92,6 +97,7 @@ zoneconf.c \ lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \ -+ dbus_service.c dbus_mgr.c \ - $(DBDRIVER_SRCS) ++ dbus_service.c dbus_mgr.c \ + ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS} MANPAGES = named.8 lwresd.8 named.conf.5 -@@ -114,9 +118,14 @@ +@@ -120,9 +126,14 @@ -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ -c ${srcdir}/config.c @@ -52,19 +50,19 @@ doc man:: ${MANOBJS} ---- bind-9.3.1/bin/named_sdb/main.c.sdb_dbus 2005-08-16 21:18:06.000000000 -0400 -+++ bind-9.3.1/bin/named_sdb/main.c 2005-08-16 21:21:40.000000000 -0400 -@@ -243,7 +243,8 @@ +--- bind-9.4.0/bin/named_sdb/main.c.sdb_dbus 2007-03-06 14:12:30.000000000 +0100 ++++ bind-9.4.0/bin/named_sdb/main.c 2007-03-06 14:17:51.000000000 +0100 +@@ -251,7 +251,8 @@ "usage: named [-4|-6] [-c conffile] [-d debuglevel] " "[-f|-g] [-n number_of_cpus]\n" " [-p port] [-s] [-t chrootdir] [-u username]\n" -- " [-m {usage|trace|record}]\n"); -+ " [-m {usage|trace|record}]\n" -+ " [-D ]\n"); +- " [-m {usage|trace|record|size|mctx}]\n"); ++ " [-m {usage|trace|record|size|mctx}]\n" ++ " [-D ]\n"); } static void -@@ -349,7 +350,7 @@ +@@ -359,7 +360,7 @@ isc_commandline_errprint = ISC_FALSE; while ((ch = isc_commandline_parse(argc, argv, @@ -73,7 +71,7 @@ switch (ch) { case '4': if (disable4) -@@ -438,6 +439,9 @@ +@@ -448,6 +449,9 @@ case 'v': printf("BIND %s\n", ns_g_version); exit(0); bind-9.3.1rc1-sdb.patch: bin/Makefile.in | 2 - bin/named_sdb/Makefile.in | 25 +++++------------- bin/named_sdb/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 3 ++ 4 files changed, 74 insertions(+), 18 deletions(-) Index: bind-9.3.1rc1-sdb.patch =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.1rc1-sdb.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bind-9.3.1rc1-sdb.patch 17 Feb 2005 06:43:28 -0000 1.2 +++ bind-9.3.1rc1-sdb.patch 6 Mar 2007 15:32:16 -0000 1.3 @@ -1,6 +1,6 @@ ---- bind-9.3.1rc1/configure.in.sdb 2005-02-16 22:25:08.000000000 -0500 -+++ bind-9.3.1rc1/configure.in 2005-02-16 22:25:08.000000000 -0500 -@@ -2194,6 +2194,8 @@ +--- bind-9.4.0/configure.in.sdb 2007-03-06 12:59:32.000000000 +0100 ++++ bind-9.4.0/configure.in 2007-03-06 12:59:32.000000000 +0100 +@@ -2457,6 +2457,8 @@ bin/check/Makefile bin/named/Makefile bin/named/unix/Makefile @@ -9,17 +9,28 @@ bin/rndc/Makefile bin/rndc/unix/Makefile bin/dig/Makefile -@@ -2215,6 +2217,7 @@ +@@ -2478,6 +2480,7 @@ bin/tests/system/tkey/Makefile bin/tests/headerdep_test.sh bin/dnssec/Makefile + bin/sdb_tools/Makefile doc/Makefile doc/arm/Makefile - doc/arm/nominum-docbook-html.dsl ---- bind-9.3.1rc1/bin/named_sdb/main.c.sdb 2004-10-24 20:42:54.000000000 -0400 -+++ bind-9.3.1rc1/bin/named_sdb/main.c 2005-02-16 22:25:08.000000000 -0500 -@@ -71,6 +71,9 @@ + doc/misc/Makefile +--- bind-9.4.0/bin/Makefile.in.sdb 2004-03-05 05:57:10.000000000 +0100 ++++ bind-9.4.0/bin/Makefile.in 2007-03-06 12:59:32.000000000 +0100 +@@ -19,7 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests nsupdate check ++SUBDIRS = named named_sdb rndc dig dnssec tests nsupdate check sdb_tools + TARGETS = + + @BIND9_MAKE_RULES@ +--- bind-9.4.0/bin/named_sdb/main.c.sdb 2006-11-10 19:51:14.000000000 +0100 ++++ bind-9.4.0/bin/named_sdb/main.c 2007-03-06 13:43:31.000000000 +0100 +@@ -72,6 +72,9 @@ * Include header files for database drivers here. */ /* #include "xxdb.h" */ @@ -27,80 +38,90 @@ +#include "pgsqldb.h" +#include "dirdb.h" - static isc_boolean_t want_stats = ISC_FALSE; - static char program_name[ISC_DIR_NAMEMAX] = "named"; -@@ -656,7 +659,57 @@ - * Add calls to register sdb drivers here. - */ - /* xxdb_init(); */ -- -+ result = ldapdb_init(); -+ if (result != ISC_R_SUCCESS) -+ { -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -+ ISC_LOG_ERROR, -+ "SDB ldap module initialisation failed: %s.", -+ isc_result_totext(result) -+ ); -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -+ ISC_LOG_ERROR, -+ "SDB ldap zone database will be unavailable." -+ ); -+ }else -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -+ ISC_LOG_NOTICE, "SDB ldap zone database module loaded." -+ ); -+ -+ result = pgsqldb_init(); -+ if (result != ISC_R_SUCCESS) -+ { -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -+ ISC_LOG_ERROR, -+ "SDB pgsql module initialisation failed: %s.", -+ isc_result_totext(result) -+ ); -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -+ ISC_LOG_ERROR, -+ "SDB pgsql zone database will be unavailable." -+ ); -+ }else -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -+ ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded." -+ ); -+ -+ result = dirdb_init(); -+ if (result != ISC_R_SUCCESS) -+ { -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -+ ISC_LOG_ERROR, -+ "SDB directory DB module initialisation failed: %s.", -+ isc_result_totext(result) -+ ); -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -+ ISC_LOG_ERROR, -+ "SDB directory DB zone database will be unavailable." -+ ); -+ }else -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -+ ISC_LOG_NOTICE, "SDB directory DB zone database module loaded." -+ ); -+ - ns_server_create(ns_g_mctx, &ns_g_server); - } - -@@ -673,6 +726,10 @@ - */ - /* xxdb_clear(); */ + /* + * Include DLZ drivers if appropriate. +@@ -639,6 +642,10 @@ + ns_main_earlyfatal("isc_app_start() failed: %s", + isc_result_totext(result)); + ldapdb_clear(); + pgsqldb_clear(); + dirdb_clear(); + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, + ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version, + saved_command_line); +@@ -692,6 +699,57 @@ + isc_result_totext(result)); + #endif + ++ result = ldapdb_init(); ++ if (result != ISC_R_SUCCESS) ++ { ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ++ ISC_LOG_ERROR, ++ "SDB ldap module initialisation failed: %s.", ++ isc_result_totext(result) ++ ); ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ++ ISC_LOG_ERROR, ++ "SDB ldap zone database will be unavailable." ++ ); ++ }else ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ++ ISC_LOG_NOTICE, "SDB ldap zone database module loaded." ++ ); ++ ++ result = pgsqldb_init(); ++ if (result != ISC_R_SUCCESS) ++ { ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ++ ISC_LOG_ERROR, ++ "SDB pgsql module initialisation failed: %s.", ++ isc_result_totext(result) ++ ); ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ++ ISC_LOG_ERROR, ++ "SDB pgsql zone database will be unavailable." ++ ); ++ }else ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ++ ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded." ++ ); ++ ++ result = dirdb_init(); ++ if (result != ISC_R_SUCCESS) ++ { ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ++ ISC_LOG_ERROR, ++ "SDB directory DB module initialisation failed: %s.", ++ isc_result_totext(result) ++ ); ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ++ ISC_LOG_ERROR, ++ "SDB directory DB zone database will be unavailable." ++ ); ++ }else ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ++ ISC_LOG_NOTICE, "SDB directory DB zone database module loaded." ++ ); ++ + ns_server_create(ns_g_mctx, &ns_g_server); + } + +@@ -717,6 +775,10 @@ + + dns_name_destroy(); + ++ ldapdb_clear(); ++ pgsqldb_clear(); ++ dirdb_clear(); ++ + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, "exiting"); ns_log_shutdown(); ---- bind-9.3.1rc1/bin/named_sdb/Makefile.in.sdb 2005-02-16 22:25:08.000000000 -0500 -+++ bind-9.3.1rc1/bin/named_sdb/Makefile.in 2005-02-16 22:25:08.000000000 -0500 +--- bind-9.4.0/bin/named_sdb/Makefile.in.sdb 2007-03-06 12:59:32.000000000 +0100 ++++ bind-9.4.0/bin/named_sdb/Makefile.in 2007-03-06 12:59:32.000000000 +0100 @@ -26,10 +26,10 @@ # # Add database drivers here. @@ -113,18 +134,18 @@ -DBDRIVER_LIBS = +DBDRIVER_LIBS = -lldap -llber -lpq - CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include \ - ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ -@@ -61,7 +61,7 @@ + DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers + +@@ -70,7 +70,7 @@ SUBDIRS = unix -TARGETS = named at EXEEXT@ lwresd at EXEEXT@ +TARGETS = named_sdb at EXEEXT@ - OBJS = aclconf.o builtin.o client.o config.o control.o \ + OBJS = builtin.o client.o config.o control.o \ controlconf.o interfacemgr.o \ -@@ -114,14 +114,10 @@ +@@ -120,14 +120,10 @@ -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ -c ${srcdir}/config.c @@ -140,7 +161,7 @@ doc man:: ${MANOBJS} docclean manclean maintainer-clean:: -@@ -132,13 +128,8 @@ +@@ -138,14 +134,9 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} @@ -157,14 +178,4 @@ + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named_sdb at EXEEXT@ ${DESTDIR}${sbindir} + ---- bind-9.3.1rc1/bin/Makefile.in.sdb 2004-03-06 05:21:10.000000000 -0500 -+++ bind-9.3.1rc1/bin/Makefile.in 2005-02-16 22:25:08.000000000 -0500 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests nsupdate check -+SUBDIRS = named named_sdb rndc dig dnssec tests nsupdate check sdb_tools - TARGETS = - - @BIND9_MAKE_RULES@ + @DLZ_DRIVER_RULES@ bind-9.3.2b1-PIE.patch: bin/check/Makefile.in | 22 ++++++++++++++-------- bin/dig/Makefile.in | 20 +++++++++++++------- bin/dnssec/Makefile.in | 20 +++++++++++++------- bin/named/Makefile.in | 32 +++++++++++++++++++------------- bin/named/unix/Makefile.in | 6 +++++- bin/nsupdate/Makefile.in | 12 +++++++++--- bin/rndc/Makefile.in | 24 +++++++++++++++--------- bin/rndc/unix/Makefile.in | 8 +++++++- make/rules.in | 3 +++ 9 files changed, 98 insertions(+), 49 deletions(-) Index: bind-9.3.2b1-PIE.patch =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.2b1-PIE.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-9.3.2b1-PIE.patch 3 Dec 2005 00:10:48 -0000 1.1 +++ bind-9.3.2b1-PIE.patch 6 Mar 2007 15:32:16 -0000 1.2 @@ -1,6 +1,6 @@ ---- bind-9.3.2b1/make/rules.in.PIE 2005-05-12 17:36:17.000000000 -0400 -+++ bind-9.3.2b1/make/rules.in 2005-10-06 20:04:36.000000000 -0400 -@@ -118,6 +118,9 @@ +--- bind-9.4.0/make/rules.in.PIE 2007-01-30 00:57:21.000000000 +0100 ++++ bind-9.4.0/make/rules.in 2007-03-06 12:53:37.000000000 +0100 +@@ -124,6 +124,9 @@ .c. at O@: ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c $< @@ -10,108 +10,55 @@ SHELL = @SHELL@ LIBTOOL = @LIBTOOL@ LIBTOOL_MODE_COMPILE = ${LIBTOOL} @LIBTOOL_MODE_COMPILE@ ---- bind-9.3.2b1/bin/dnssec/Makefile.in.PIE 2005-05-01 20:25:54.000000000 -0400 -+++ bind-9.3.2b1/bin/dnssec/Makefile.in 2005-10-06 20:04:36.000000000 -0400 -@@ -41,7 +41,7 @@ - # Alphabetically - TARGETS = dnssec-keygen at EXEEXT@ dnssec-signzone at EXEEXT@ - --OBJS = dnssectool. at O@ -+OBJS = dnssectool.o - - SRCS = dnssec-keygen.c dnssec-signzone.c dnssectool.c - -@@ -51,19 +51,25 @@ +--- bind-9.4.0/bin/rndc/Makefile.in.PIE 2007-01-19 01:55:49.000000000 +0100 ++++ bind-9.4.0/bin/rndc/Makefile.in 2007-03-06 12:53:37.000000000 +0100 +@@ -59,28 +59,34 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} -+EXT_CFLAGS = -fPIE -+ - @BIND9_MAKE_RULES@ - --dnssec-keygen at EXEEXT@: dnssec-keygen. at O@ ${OBJS} ${DEPLIBS} -+LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack -+ -+.SUFFIXES: .c .o -+ -+dnssec-keygen at EXEEXT@: dnssec-keygen.o ${OBJS} ${DEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ -- dnssec-keygen. at O@ ${OBJS} ${LIBS} -+ dnssec-keygen.o ${OBJS} ${LIBS} - --dnssec-signzone. at O@: dnssec-signzone.c -- ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \ -+dnssec-signzone.o: dnssec-signzone.c -+ ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \ - -c ${srcdir}/dnssec-signzone.c - --dnssec-signzone at EXEEXT@: dnssec-signzone. at O@ ${OBJS} ${DEPLIBS} -+dnssec-signzone at EXEEXT@: dnssec-signzone.o ${OBJS} ${DEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ -- dnssec-signzone. at O@ ${OBJS} ${LIBS} -+ dnssec-signzone.o ${OBJS} ${LIBS} - - doc man:: ${MANOBJS} - ---- bind-9.3.2b1/bin/named/Makefile.in.PIE 2004-09-06 17:47:25.000000000 -0400 -+++ bind-9.3.2b1/bin/named/Makefile.in 2005-10-06 20:04:36.000000000 -0400 -@@ -63,17 +63,17 @@ - - TARGETS = named at EXEEXT@ lwresd at EXEEXT@ - --OBJS = aclconf. at O@ builtin. at O@ client. at O@ config. at O@ control. at O@ \ -- controlconf. at O@ interfacemgr. at O@ \ -- listenlist. at O@ log. at O@ logconf. at O@ main. at O@ notify. at O@ \ -- query. at O@ server. at O@ sortlist. at O@ \ -- tkeyconf. at O@ tsigconf. at O@ update. at O@ xfrout. at O@ \ -- zoneconf. at O@ \ -- lwaddr. at O@ lwresd. at O@ lwdclient. at O@ lwderror. at O@ lwdgabn. at O@ \ -- lwdgnba. at O@ lwdgrbn. at O@ lwdnoop. at O@ lwsearch. at O@ \ -+OBJS = aclconf.o builtin.o client.o config.o control.o \ -+ controlconf.o interfacemgr.o \ -+ listenlist.o log.o logconf.o main.o notify.o \ -+ query.o server.o sortlist.o \ -+ tkeyconf.o tsigconf.o update.o xfrout.o \ -+ zoneconf.o \ -+ lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \ -+ lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \ - $(DBDRIVER_OBJS) - -UOBJS = unix/os. at O@ +UOBJS = unix/os.o - - SRCS = aclconf.c builtin.c client.c config.c control.c \ - controlconf.c interfacemgr.c \ -@@ -91,16 +91,22 @@ - - MANOBJS = ${MANPAGES} ${HTMLPAGES} - -+EXT_CFLAGS = -fPIE + ++EXT_CFLAGS = -fPIE + @BIND9_MAKE_RULES@ --main. at O@: main.c +-rndc. at O@: rndc.c - ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ +LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack + +.SUFFIXES: .c .o + -+main.o: main.c ++rndc.o: rndc.c + ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ - -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ - -DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c + -DRNDC_CONFFILE=\"${sysconfdir}/rndc.conf\" \ + -DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \ + -c ${srcdir}/rndc.c --config. at O@: config.c +-rndc-confgen. at O@: rndc-confgen.c - ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -+config.o: config.c ++rndc-confgen.o: rndc-confgen.c + ${CC} ${ALL_CFLAGS} \ - -DVERSION=\"${VERSION}\" \ - -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ - -c ${srcdir}/config.c ---- bind-9.3.2b1/bin/named/unix/Makefile.in.PIE 2004-03-08 04:04:15.000000000 -0500 -+++ bind-9.3.2b1/bin/named/unix/Makefile.in 2005-10-06 20:04:36.000000000 -0400 -@@ -27,10 +27,14 @@ + -DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \ + -c ${srcdir}/rndc-confgen.c + +-rndc at EXEEXT@: rndc. at O@ util. at O@ ${RNDCDEPLIBS} +- ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rndc. at O@ util. at O@ \ ++rndc at EXEEXT@: rndc.o util.o ${RNDCDEPLIBS} ++ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rndc.o util.o \ + ${RNDCLIBS} + +-rndc-confgen at EXEEXT@: rndc-confgen. at O@ util. at O@ ${UOBJS} ${CONFDEPLIBS} +- ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rndc-confgen. at O@ util. at O@ \ ++rndc-confgen at EXEEXT@: rndc-confgen.o util.o ${UOBJS} ${CONFDEPLIBS} ++ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rndc-confgen.o util.o \ + ${UOBJS} ${CONFLIBS} + + doc man:: ${MANOBJS} +--- bind-9.4.0/bin/rndc/unix/Makefile.in.PIE 2004-03-05 05:58:29.000000000 +0100 ++++ bind-9.4.0/bin/rndc/unix/Makefile.in 2007-03-06 12:53:37.000000000 +0100 +@@ -27,10 +27,16 @@ CDEFINES = CWARNINGS = @@ -126,10 +73,11 @@ + @BIND9_MAKE_RULES@ + ++LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack ++ +.SUFFIXES: .c .o -\ No newline at end of file ---- bind-9.3.2b1/bin/check/Makefile.in.PIE 2004-07-20 03:01:48.000000000 -0400 -+++ bind-9.3.2b1/bin/check/Makefile.in 2005-10-06 20:04:36.000000000 -0400 +--- bind-9.4.0/bin/check/Makefile.in.PIE 2006-06-09 02:54:08.000000000 +0200 ++++ bind-9.4.0/bin/check/Makefile.in 2007-03-06 12:57:46.000000000 +0100 @@ -55,27 +55,33 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -167,23 +115,66 @@ -named-checkzone at EXEEXT@: named-checkzone. at O@ check-tool. at O@ ${ISCDEPLIBS} ${DNSDEPLIBS} +named-checkzone at EXEEXT@: named-checkzone.o check-tool.o ${ISCDEPLIBS} ${DNSDEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ -- named-checkzone. at O@ check-tool. at O@ ${DNSLIBS} ${ISCLIBS} ${LIBS} -+ named-checkzone.o check-tool.o ${DNSLIBS} ${ISCLIBS} ${LIBS} +- named-checkzone. at O@ check-tool. at O@ ${ISCCFGLIBS} ${DNSLIBS} \ ++ named-checkzone.o check-tool.o ${ISCCFGLIBS} ${DNSLIBS} \ + ${ISCLIBS} ${LIBS} doc man:: ${MANOBJS} +--- bind-9.4.0/bin/dnssec/Makefile.in.PIE 2005-05-02 02:26:11.000000000 +0200 ++++ bind-9.4.0/bin/dnssec/Makefile.in 2007-03-06 12:53:37.000000000 +0100 +@@ -41,7 +41,7 @@ + # Alphabetically + TARGETS = dnssec-keygen at EXEEXT@ dnssec-signzone at EXEEXT@ ---- bind-9.3.2b1/bin/nsupdate/Makefile.in.PIE 2004-07-20 03:01:49.000000000 -0400 -+++ bind-9.3.2b1/bin/nsupdate/Makefile.in 2005-10-06 20:04:36.000000000 -0400 -@@ -49,7 +49,7 @@ +-OBJS = dnssectool. at O@ ++OBJS = dnssectool.o - TARGETS = nsupdate at EXEEXT@ + SRCS = dnssec-keygen.c dnssec-signzone.c dnssectool.c --OBJS = nsupdate. at O@ -+OBJS = nsupdate.o +@@ -51,19 +51,25 @@ + + MANOBJS = ${MANPAGES} ${HTMLPAGES} + ++EXT_CFLAGS = -fPIE ++ + @BIND9_MAKE_RULES@ + +-dnssec-keygen at EXEEXT@: dnssec-keygen. at O@ ${OBJS} ${DEPLIBS} ++LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack ++ ++.SUFFIXES: .c .o ++ ++dnssec-keygen at EXEEXT@: dnssec-keygen.o ${OBJS} ${DEPLIBS} + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ +- dnssec-keygen. at O@ ${OBJS} ${LIBS} ++ dnssec-keygen.o ${OBJS} ${LIBS} + +-dnssec-signzone. at O@: dnssec-signzone.c +- ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \ ++dnssec-signzone.o: dnssec-signzone.c ++ ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \ + -c ${srcdir}/dnssec-signzone.c + +-dnssec-signzone at EXEEXT@: dnssec-signzone. at O@ ${OBJS} ${DEPLIBS} ++dnssec-signzone at EXEEXT@: dnssec-signzone.o ${OBJS} ${DEPLIBS} + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ +- dnssec-signzone. at O@ ${OBJS} ${LIBS} ++ dnssec-signzone.o ${OBJS} ${LIBS} + + doc man:: ${MANOBJS} + +--- bind-9.4.0/bin/dig/Makefile.in.PIE 2005-09-09 16:11:04.000000000 +0200 ++++ bind-9.4.0/bin/dig/Makefile.in 2007-03-06 12:53:37.000000000 +0100 +@@ -51,7 +51,7 @@ + + TARGETS = dig at EXEEXT@ host at EXEEXT@ nslookup at EXEEXT@ + +-OBJS = dig. at O@ dighost. at O@ host. at O@ nslookup. at O@ ++OBJS = dig.o dighost.o host.o nslookup.o UOBJS = -@@ -61,10 +61,16 @@ +@@ -63,19 +63,25 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -191,66 +182,89 @@ + @BIND9_MAKE_RULES@ --nsupdate at EXEEXT@: nsupdate. at O@ ${UOBJS} ${DEPLIBS} -- ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsupdate. at O@ ${UOBJS} ${LIBS} +-dig at EXEEXT@: dig. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS} +LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack + +.SUFFIXES: .c .o + -+nsupdate at EXEEXT@: nsupdate.o ${UOBJS} ${DEPLIBS} -+ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsupdate.o ${UOBJS} ${LIBS} ++dig at EXEEXT@: dig.o dighost.o ${UOBJS} ${DEPLIBS} + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ +- dig. at O@ dighost. at O@ ${UOBJS} ${LIBS} ++ dig.o dighost.o ${UOBJS} ${LIBS} + +-host at EXEEXT@: host. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS} ++host at EXEEXT@: host.o dighost.o ${UOBJS} ${DEPLIBS} + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ +- host. at O@ dighost. at O@ ${UOBJS} ${LIBS} ++ host.o dighost.o ${UOBJS} ${LIBS} + +-nslookup at EXEEXT@: nslookup. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS} ++nslookup at EXEEXT@: nslookup.o dighost.o ${UOBJS} ${DEPLIBS} + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ +- nslookup. at O@ dighost. at O@ ${UOBJS} ${LIBS} ++ nslookup.o dighost.o ${UOBJS} ${LIBS} doc man:: ${MANOBJS} ---- bind-9.3.2b1/bin/rndc/Makefile.in.PIE 2004-07-20 03:01:50.000000000 -0400 -+++ bind-9.3.2b1/bin/rndc/Makefile.in 2005-10-06 20:05:10.000000000 -0400 -@@ -57,28 +57,34 @@ +--- bind-9.4.0/bin/named/Makefile.in.PIE 2005-09-05 02:18:10.000000000 +0200 ++++ bind-9.4.0/bin/named/Makefile.in 2007-03-06 12:59:02.000000000 +0100 +@@ -72,17 +72,17 @@ - MANOBJS = ${MANPAGES} ${HTMLPAGES} + TARGETS = named at EXEEXT@ lwresd at EXEEXT@ + +-OBJS = builtin. at O@ client. at O@ config. at O@ control. at O@ \ +- controlconf. at O@ interfacemgr. at O@ \ +- listenlist. at O@ log. at O@ logconf. at O@ main. at O@ notify. at O@ \ +- query. at O@ server. at O@ sortlist. at O@ \ +- tkeyconf. at O@ tsigconf. at O@ update. at O@ xfrout. at O@ \ +- zoneconf. at O@ \ +- lwaddr. at O@ lwresd. at O@ lwdclient. at O@ lwderror. at O@ lwdgabn. at O@ \ +- lwdgnba. at O@ lwdgrbn. at O@ lwdnoop. at O@ lwsearch. at O@ \ ++OBJS = builtin.o client.o config.o control.o \ ++ controlconf.o interfacemgr.o \ ++ listenlist.o log.o logconf.o main.o notify.o \ ++ query.o server.o sortlist.o \ ++ tkeyconf.o tsigconf.o update.o xfrout.o \ ++ zoneconf.o \ ++ lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \ ++ lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \ + ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS} -UOBJS = unix/os. at O@ +UOBJS = unix/os.o -+ -+EXT_CFLAGS = -fPIE + SRCS = builtin.c client.c config.c control.c \ + controlconf.c interfacemgr.c \ +@@ -100,16 +100,22 @@ + + MANOBJS = ${MANPAGES} ${HTMLPAGES} + ++EXT_CFLAGS = -fPIE ++ @BIND9_MAKE_RULES@ --rndc. at O@: rndc.c +-main. at O@: main.c - ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ +LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack + +.SUFFIXES: .c .o + -+rndc.o: rndc.c ++main.o: main.c + ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ - -DRNDC_CONFFILE=\"${sysconfdir}/rndc.conf\" \ - -DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \ - -c ${srcdir}/rndc.c + -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ + -DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c --rndc-confgen. at O@: rndc-confgen.c +-config. at O@: config.c - ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -+rndc-confgen.o: rndc-confgen.c ++config.o: config.c + ${CC} ${ALL_CFLAGS} \ - -DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \ - -c ${srcdir}/rndc-confgen.c - --rndc at EXEEXT@: rndc. at O@ util. at O@ ${RNDCDEPLIBS} -- ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rndc. at O@ util. at O@ \ -+rndc at EXEEXT@: rndc.o util.o ${RNDCDEPLIBS} -+ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rndc.o util.o \ - ${RNDCLIBS} - --rndc-confgen at EXEEXT@: rndc-confgen. at O@ util. at O@ ${UOBJS} ${CONFDEPLIBS} -- ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rndc-confgen. at O@ util. at O@ \ -+rndc-confgen at EXEEXT@: rndc-confgen.o util.o ${UOBJS} ${CONFDEPLIBS} -+ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rndc-confgen.o util.o \ - ${UOBJS} ${CONFLIBS} - - doc man:: ${MANOBJS} ---- bind-9.3.2b1/bin/rndc/unix/Makefile.in.PIE 2004-03-07 23:04:24.000000000 -0500 -+++ bind-9.3.2b1/bin/rndc/unix/Makefile.in 2005-10-06 20:04:36.000000000 -0400 -@@ -27,10 +27,16 @@ + -DVERSION=\"${VERSION}\" \ + -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ + -c ${srcdir}/config.c +--- bind-9.4.0/bin/named/unix/Makefile.in.PIE 2004-03-05 05:58:01.000000000 +0100 ++++ bind-9.4.0/bin/named/unix/Makefile.in 2007-03-06 12:53:37.000000000 +0100 +@@ -27,10 +27,14 @@ CDEFINES = CWARNINGS = @@ -265,21 +279,20 @@ + @BIND9_MAKE_RULES@ + -+LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack -+ +.SUFFIXES: .c .o ---- bind-9.3.2b1/bin/dig/Makefile.in.PIE 2004-08-18 19:25:57.000000000 -0400 -+++ bind-9.3.2b1/bin/dig/Makefile.in 2005-10-06 20:04:36.000000000 -0400 -@@ -51,7 +51,7 @@ +\ Chyb?? znak konce ????dku na konci souboru +--- bind-9.4.0/bin/nsupdate/Makefile.in.PIE 2004-07-20 09:03:20.000000000 +0200 ++++ bind-9.4.0/bin/nsupdate/Makefile.in 2007-03-06 12:53:37.000000000 +0100 +@@ -49,7 +49,7 @@ - TARGETS = dig at EXEEXT@ host at EXEEXT@ nslookup at EXEEXT@ + TARGETS = nsupdate at EXEEXT@ --OBJS = dig. at O@ dighost. at O@ host. at O@ nslookup. at O@ -+OBJS = dig.o dighost.o host.o nslookup.o +-OBJS = nsupdate. at O@ ++OBJS = nsupdate.o UOBJS = -@@ -63,19 +63,25 @@ +@@ -61,10 +61,16 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -287,27 +300,14 @@ + @BIND9_MAKE_RULES@ --dig at EXEEXT@: dig. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS} +-nsupdate at EXEEXT@: nsupdate. at O@ ${UOBJS} ${DEPLIBS} +- ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsupdate. at O@ ${UOBJS} ${LIBS} +LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack + +.SUFFIXES: .c .o + -+dig at EXEEXT@: dig.o dighost.o ${UOBJS} ${DEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ -- dig. at O@ dighost. at O@ ${UOBJS} ${LIBS} -+ dig.o dighost.o ${UOBJS} ${LIBS} - --host at EXEEXT@: host. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS} -+host at EXEEXT@: host.o dighost.o ${UOBJS} ${DEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ -- host. at O@ dighost. at O@ ${UOBJS} ${LIBS} -+ host.o dighost.o ${UOBJS} ${LIBS} - --nslookup at EXEEXT@: nslookup. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS} -+nslookup at EXEEXT@: nslookup.o dighost.o ${UOBJS} ${DEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ -- nslookup. at O@ dighost. at O@ ${UOBJS} ${LIBS} -+ nslookup.o dighost.o ${UOBJS} ${LIBS} ++nsupdate at EXEEXT@: nsupdate.o ${UOBJS} ${DEPLIBS} ++ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsupdate.o ${UOBJS} ${LIBS} doc man:: ${MANOBJS} bind-9.3.3-edns.patch: bin/named/config.c | 1 + bin/named/query.c | 6 ++++++ bin/named/server.c | 5 +++++ doc/misc/options | 2 ++ lib/dns/include/dns/view.h | 1 + lib/dns/view.c | 1 + lib/isccfg/namedconf.c | 1 + 7 files changed, 17 insertions(+) Index: bind-9.3.3-edns.patch =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.3-edns.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-9.3.3-edns.patch 2 Nov 2006 12:27:31 -0000 1.1 +++ bind-9.3.3-edns.patch 6 Mar 2007 15:32:16 -0000 1.2 @@ -1,68 +1,78 @@ ---- bind-9.3.3rc2/doc/misc/options.edns 2005-05-13 04:43:27.000000000 +0200 -+++ bind-9.3.3rc2/doc/misc/options 2006-11-02 13:00:25.000000000 +0100 -@@ -83,6 +83,7 @@ - edns-udp-size ; - root-delegation-only [ exclude { ; ... } ]; - disable-algorithms { ; ... }; -+ edns-enable ; - dnssec-enable ; - dnssec-lookaside trust-anchor ; - dnssec-must-be-secure ; -@@ -263,6 +264,7 @@ - edns-udp-size ; - root-delegation-only [ exclude { ; ... } ]; - disable-algorithms { ; ... }; -+ edns-enable ; - dnssec-enable ; - dnssec-lookaside trust-anchor ; - dnssec-must-be-secure ; ---- bind-9.3.3rc2/lib/dns/view.c.edns 2004-03-10 03:55:58.000000000 +0100 -+++ bind-9.3.3rc2/lib/dns/view.c 2006-11-02 12:47:07.000000000 +0100 -@@ -156,6 +156,7 @@ +--- bind-9.4.0/lib/dns/view.c.edns 2006-03-10 00:38:21.000000000 +0100 ++++ bind-9.4.0/lib/dns/view.c 2007-03-06 14:55:44.000000000 +0100 +@@ -160,6 +160,7 @@ view->additionalfromcache = ISC_TRUE; view->additionalfromauth = ISC_TRUE; view->enablednssec = ISC_TRUE; + view->enableedns = ISC_TRUE; + view->enablevalidation = ISC_TRUE; + view->acceptexpired = ISC_FALSE; view->minimalresponses = ISC_FALSE; - view->transfer_format = dns_one_answer; - view->queryacl = NULL; ---- bind-9.3.3rc2/lib/dns/include/dns/view.h.edns 2004-03-10 03:55:58.000000000 +0100 -+++ bind-9.3.3rc2/lib/dns/include/dns/view.h 2006-11-02 12:47:07.000000000 +0100 -@@ -109,6 +109,7 @@ +--- bind-9.4.0/lib/dns/include/dns/view.h.edns 2006-03-10 00:38:21.000000000 +0100 ++++ bind-9.4.0/lib/dns/include/dns/view.h 2007-03-06 14:56:19.000000000 +0100 +@@ -112,6 +112,7 @@ isc_boolean_t additionalfromauth; isc_boolean_t minimalresponses; isc_boolean_t enablednssec; + isc_boolean_t enableedns; + isc_boolean_t enablevalidation; + isc_boolean_t acceptexpired; dns_transfer_format_t transfer_format; - dns_acl_t * queryacl; - dns_acl_t * recursionacl; ---- bind-9.3.3rc2/lib/isccfg/namedconf.c.edns 2006-03-02 01:37:20.000000000 +0100 -+++ bind-9.3.3rc2/lib/isccfg/namedconf.c 2006-11-02 12:47:07.000000000 +0100 -@@ -726,6 +726,7 @@ +--- bind-9.4.0/lib/isccfg/namedconf.c.edns 2006-05-03 03:46:40.000000000 +0200 ++++ bind-9.4.0/lib/isccfg/namedconf.c 2007-03-06 14:43:48.000000000 +0100 +@@ -767,6 +767,7 @@ { "root-delegation-only", &cfg_type_optional_exclude, 0 }, { "disable-algorithms", &cfg_type_disablealgorithm, CFG_CLAUSEFLAG_MULTI }, + { "edns-enable", &cfg_type_boolean, 0 }, { "dnssec-enable", &cfg_type_boolean, 0 }, + { "dnssec-validation", &cfg_type_boolean, 0 }, { "dnssec-lookaside", &cfg_type_lookaside, CFG_CLAUSEFLAG_MULTI }, - { "dnssec-must-be-secure", &cfg_type_mustbesecure, ---- bind-9.3.3rc2/bin/named/server.c.edns 2006-11-02 12:47:07.000000000 +0100 -+++ bind-9.3.3rc2/bin/named/server.c 2006-11-02 12:47:07.000000000 +0100 -@@ -1181,6 +1181,11 @@ - result = ns_config_get(maps, "provide-ixfr", &obj); - INSIST(result == ISC_R_SUCCESS); - view->provideixfr = cfg_obj_asboolean(obj); +--- bind-9.4.0/doc/misc/options.edns 2006-05-03 04:26:59.000000000 +0200 ++++ bind-9.4.0/doc/misc/options 2007-03-06 14:43:48.000000000 +0100 +@@ -85,6 +85,7 @@ + max-udp-size ; + root-delegation-only [ exclude { ; ... } ]; + disable-algorithms { ; ... }; ++ edns-enable ; + dnssec-enable ; + dnssec-validation ; + dnssec-lookaside trust-anchor ; +@@ -313,6 +314,7 @@ + max-udp-size ; + root-delegation-only [ exclude { ; ... } ]; + disable-algorithms { ; ... }; ++ edns-enable ; + dnssec-enable ; + dnssec-validation ; + dnssec-lookaside trust-anchor ; +--- bind-9.4.0/bin/named/config.c.edns 2006-05-03 03:46:40.000000000 +0200 ++++ bind-9.4.0/bin/named/config.c 2007-03-06 15:02:07.000000000 +0100 +@@ -135,6 +135,7 @@ + acache-enable no;\n\ + acache-cleaning-interval 60;\n\ + max-acache-size 0;\n\ ++ edns-enable yes;\n\ + dnssec-enable yes;\n\ + dnssec-validation no; /* Make yes for 9.5. */ \n\ + dnssec-accept-expired no;\n\ +--- bind-9.4.0/bin/named/server.c.edns 2007-03-06 14:43:48.000000000 +0100 ++++ bind-9.4.0/bin/named/server.c 2007-03-06 15:01:24.000000000 +0100 +@@ -1492,6 +1492,11 @@ + dns_resolver_setclientsperquery(view->resolver, + cfg_obj_asuint32(obj), + max_clients_per_query); + + obj = NULL; + (void)ns_config_get(maps, "edns-enable", &obj); -+ if (obj != NULL) -+ view->enableedns = cfg_obj_asboolean(obj); ++ if(obj != NULL) ++ view->enableedns = cfg_obj_asboolean(obj); obj = NULL; result = ns_config_get(maps, "dnssec-enable", &obj); ---- bind-9.3.3rc2/bin/named/query.c.edns 2006-08-31 05:57:11.000000000 +0200 -+++ bind-9.3.3rc2/bin/named/query.c 2006-11-02 12:47:07.000000000 +0100 -@@ -3558,6 +3558,12 @@ +--- bind-9.4.0/bin/named/query.c.edns 2007-01-08 03:41:59.000000000 +0100 ++++ bind-9.4.0/bin/named/query.c 2007-03-06 14:43:48.000000000 +0100 +@@ -4578,6 +4578,12 @@ if (client->view->enablednssec) message->flags |= DNS_MESSAGEFLAG_AD; @@ -75,13 +85,3 @@ qclient = NULL; ns_client_attach(client, &qclient); query_find(qclient, NULL, qtype); ---- bind-9.3.3rc2/bin/named/config.c.edns 2006-02-28 07:32:53.000000000 +0100 -+++ bind-9.3.3rc2/bin/named/config.c 2006-11-02 12:47:07.000000000 +0100 -@@ -125,6 +125,7 @@ - check-names master fail;\n\ - check-names slave warn;\n\ - check-names response ignore;\n\ -+ edns-enable yes;\n\ - dnssec-enable no; /* Make yes for 9.4. */ \n\ - " - bind-9.3.3rc2-dbus.patch: bin/named/Makefile.in | 13 +++- bin/named/include/named/globals.h | 2 bin/named/include/named/log.h | 2 bin/named/include/named/server.h | 2 bin/named/include/named/types.h | 2 bin/named/log.c | 2 bin/named/main.c | 8 +- bin/named/named.8 | 76 ++++++++++++++++++++++++ bin/named/server.c | 25 +++++++- lib/dns/forward.c | 86 +++++++++++++++++++++++++++ lib/dns/include/dns/forward.h | 31 +++++++++ lib/dns/include/dns/rbt.h | 11 +++ lib/dns/rbt.c | 41 +++++++++++++ lib/isc/include/isc/socket.h | 55 +++++++++++++++++ lib/isc/unix/socket.c | 118 ++++++++++++++++++++++++++++++++++++-- 15 files changed, 461 insertions(+), 13 deletions(-) Index: bind-9.3.3rc2-dbus.patch =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.3rc2-dbus.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-9.3.3rc2-dbus.patch 15 Sep 2006 14:46:33 -0000 1.1 +++ bind-9.3.3rc2-dbus.patch 6 Mar 2007 15:32:16 -0000 1.2 @@ -1,208 +1,84 @@ ---- bind-9.3.2b2/lib/dns/rbt.c.dbus 2005-06-17 21:03:24.000000000 -0400 -+++ bind-9.3.2b2/lib/dns/rbt.c 2005-11-15 12:45:05.000000000 -0500 -@@ -2172,6 +2172,47 @@ - dns_rbt_printtree(rbt->root, NULL, 0); - } +--- bind-9.4.0/lib/isc/include/isc/socket.h.dbus 2006-06-07 02:29:45.000000000 +0200 ++++ bind-9.4.0/lib/isc/include/isc/socket.h 2007-03-06 13:58:11.000000000 +0100 +@@ -135,6 +135,10 @@ + #define ISC_SOCKEVENT_NEWCONN (ISC_EVENTCLASS_SOCKET + 3) + #define ISC_SOCKEVENT_CONNECT (ISC_EVENTCLASS_SOCKET + 4) -+static void -+dns_rbt_traverse_tree(dns_rbtnode_t *root, dns_rbt_traverse_callback_t cb, void *cb_arg1, void *cb_arg2 ) { -+/* -+ * This is used ONLY to traverse the forward table by dbus_mgr at the moment. -+ * Since the forward table is not likely to be large, this can be recursive. -+ */ -+ dns_name_t name; -+ dns_offsets_t offsets; -+ char buf[DNS_NAME_MAXWIRE]; -+ isc_buffer_t buffer; -+ -+ if (root != NULL) { -+ -+ if (DOWN(root)) -+ dns_rbt_traverse_tree(DOWN(root), cb, cb_arg1, cb_arg2); -+ -+ if( LEFT(root) != NULL ) -+ dns_rbt_traverse_tree(LEFT(root), cb, cb_arg1, cb_arg2); -+ -+ if( RIGHT(root) != NULL ) -+ dns_rbt_traverse_tree(RIGHT(root), cb, cb_arg1, cb_arg2); -+ -+ if( DATA(root) == 0L ) -+ return; -+ -+ dns_name_init(&name, offsets); -+ isc_buffer_init(&buffer, buf, DNS_NAME_MAXWIRE); -+ dns_name_setbuffer( &name, &buffer); -+ dns_rbt_fullnamefromnode(root, &name); -+ -+ (*cb)(&name, DATA(root), cb_arg1, cb_arg2); -+ } -+} -+ -+void dns_rbt_traverse( dns_rbt_t *rbt, dns_rbt_traverse_callback_t cb, void *cb_arg1, void *cb_arg2 ) -+{ -+ REQUIRE(VALID_RBT(rbt)); -+ -+ dns_rbt_traverse_tree( rbt->root, cb, cb_arg1, cb_arg2 ); -+} ++#define ISC_SOCKEVENT_READ_READY (ISC_EVENTCLASS_SOCKET + 5) ++#define ISC_SOCKEVENT_WRITE_READY (ISC_EVENTCLASS_SOCKET + 6) ++#define ISC_SOCKEVENT_SELECTED (ISC_EVENTCLASS_SOCKET + 7) + /* - * Chain Functions + * Internal events. */ ---- bind-9.3.2b2/lib/dns/forward.c.dbus 2005-03-16 22:58:30.000000000 -0500 -+++ bind-9.3.2b2/lib/dns/forward.c 2005-11-15 12:45:05.000000000 -0500 -@@ -200,3 +200,89 @@ - } - isc_mem_put(fwdtable->mctx, forwarders, sizeof(dns_forwarders_t)); - } -+ -+/*** -+ *** new D-BUS Dynamic Forwarding Zones functions: -+ ***/ -+isc_result_t -+dns_fwdtable_delete(dns_fwdtable_t *fwdtable, dns_name_t *name ) -+{ -+ isc_result_t result; -+ -+ REQUIRE(VALID_FWDTABLE(fwdtable)); -+ -+ RWLOCK(&fwdtable->rwlock, isc_rwlocktype_write); -+ -+ result = dns_rbt_deletename(fwdtable->table, name, ISC_FALSE); -+ -+ RWUNLOCK(&fwdtable->rwlock, isc_rwlocktype_write); -+ -+ return (result); -+} -+ -+isc_result_t -+dns_fwdtable_find_closest(dns_fwdtable_t *fwdtable, -+ dns_name_t *name, -+ dns_name_t *foundname, -+ dns_forwarders_t **forwardersp) -+{ -+ isc_result_t result; -+ -+ REQUIRE(VALID_FWDTABLE(fwdtable)); -+ -+ RWLOCK(&fwdtable->rwlock, isc_rwlocktype_read); -+ -+ result = dns_rbt_findname(fwdtable->table, name, 0, foundname, -+ (void **)forwardersp); -+ -+ if(result == DNS_R_PARTIALMATCH) -+ result = ISC_R_SUCCESS; -+ -+ RWUNLOCK(&fwdtable->rwlock, isc_rwlocktype_read); -+ -+ return (result); -+} -+ -+isc_result_t -+dns_fwdtable_find_exact(dns_fwdtable_t *fwdtable, dns_name_t *name, -+ dns_forwarders_t **forwardersp) -+{ -+ isc_result_t result; -+ -+ REQUIRE(VALID_FWDTABLE(fwdtable)); -+ -+ REQUIRE(forwardersp != 0L); -+ -+ RWLOCK(&fwdtable->rwlock, isc_rwlocktype_read); -+ -+ result = dns_rbt_findname(fwdtable->table, name, 0, NULL, -+ (void **)forwardersp); -+ -+ if( result != ISC_R_SUCCESS ) -+ *forwardersp = 0L; -+ -+ RWUNLOCK(&fwdtable->rwlock, isc_rwlocktype_read); -+ -+ return (result); -+} -+ -+static -+void dns_fwdtable_traverse -+( -+ dns_name_t *name, -+ void *node_data, -+ void *cbp, -+ void *cb_arg -+) -+{ -+ dns_fwdtable_callback_t cb = (dns_fwdtable_callback_t) cbp; -+ -+ (*cb)( name, node_data, cb_arg); -+} -+ -+void dns_fwdtable_foreach(dns_fwdtable_t *fwdtable, dns_fwdtable_callback_t cb, void *cb_arg ) -+{ -+ REQUIRE(VALID_FWDTABLE(fwdtable)); -+ -+ dns_rbt_traverse( fwdtable->table, dns_fwdtable_traverse, cb, cb_arg ); -+} ---- bind-9.3.2b2/lib/dns/include/dns/forward.h.dbus 2005-03-16 22:58:31.000000000 -0500 -+++ bind-9.3.2b2/lib/dns/include/dns/forward.h 2005-11-15 12:45:05.000000000 -0500 -@@ -98,6 +98,37 @@ - * all memory associated with the forwarding table is freed. +@@ -144,7 +148,8 @@ + typedef enum { + isc_sockettype_udp = 1, + isc_sockettype_tcp = 2, +- isc_sockettype_unix = 3 ++ isc_sockettype_unix = 3, ++ isc_sockettype_fd = 8 + } isc_sockettype_t; + + /*@{*/ +@@ -747,6 +752,54 @@ + * \li #ISC_R_FAILURE */ -+ -+/* These are ONLY used by dbus_mgr : ++isc_socketevent_t* ++isc_socket_fd_handle_reads( isc_socket_t *sock, isc_socketevent_t *dev ); ++/* register the "dev" event to be sent when the isc_sockettype_fd sock ++ * was select()-ed for read. If there is already an event registered, it ++ * is returned, otherwise 0 is returned. If dev is 0, removes any existing ++ * registered event. + */ -+ -+isc_result_t -+dns_fwdtable_delete( dns_fwdtable_t *fwdtable, dns_name_t *name ); -+/* -+ * Removes an entry from the forwarding table. ++ ++isc_socketevent_t* ++isc_socket_fd_handle_writes( isc_socket_t *sock, isc_socketevent_t *dev ); ++/* register the "dev" event to be sent when the isc_sockettype_fd sock ++ * was select()-ed for write. If there is already an event registered, it ++ * is returned, otherwise 0 is returned. If dev is 0, removes any existing ++ * registered event. + */ + -+isc_result_t -+dns_fwdtable_find_exact(dns_fwdtable_t *fwdtable, dns_name_t *name, -+ dns_forwarders_t **forwardersp); -+/* -+ * Finds an exact match for "name" in the forwarding table. ++isc_socketevent_t* ++isc_socket_fd_handle_selected( isc_socket_t *sock, isc_socketevent_t *dev ); ++/* register the "dev" event to be sent when ALL isc_sockettype_fd sockets ++ * have been select()-ed . If there is already an event registered, it ++ * is returned, otherwise 0 is returned. If dev is 0, removes any existing ++ * registered event. + */ + -+isc_result_t -+dns_fwdtable_find_closest(dns_fwdtable_t *fwdtable, dns_name_t *name, dns_name_t *foundname, -+ dns_forwarders_t **forwardersp); -+/* -+ * Finds the closest match for "*name" in the forwarding table, returning -+ * the actual name matching in *name if different to *name passed in. ++isc_socketevent_t* ++isc_socket_fd_handle_reads( isc_socket_t *sock, isc_socketevent_t *dev ); ++/* register the "dev" event to be sent when the isc_sockettype_fd sock ++ * was select()-ed for read. If there is already an event registered, it ++ * is returned, otherwise 0 is returned. If dev is 0, removes any existing ++ * registered event. + */ -+ -+typedef void (*dns_fwdtable_callback_t)( dns_name_t *, dns_forwarders_t *, void *); -+void dns_fwdtable_foreach(dns_fwdtable_t *fwdtable, dns_fwdtable_callback_t cb, void * ); -+/* Invoke cb for each member of fwdtable ++ ++isc_socketevent_t* ++isc_socket_fd_handle_writes( isc_socket_t *sock, isc_socketevent_t *dev ); ++/* register the "dev" event to be sent when the isc_sockettype_fd sock ++ * was select()-ed for write. If there is already an event registered, it ++ * is returned, otherwise 0 is returned. If dev is 0, removes any existing ++ * registered event. + */ + -+ - ISC_LANG_ENDDECLS - - #endif /* DNS_FORWARD_H */ ---- bind-9.3.2b2/lib/dns/include/dns/rbt.h.dbus 2004-10-11 01:55:51.000000000 -0400 -+++ bind-9.3.2b2/lib/dns/include/dns/rbt.h 2005-11-15 12:45:05.000000000 -0500 -@@ -833,6 +833,17 @@ - * Any error result from dns_name_concatenate. - */ - -+ -+typedef void (*dns_rbt_traverse_callback_t)( dns_name_t *name, -+ void *node_data, -+ void *cb_arg1, -+ void *cb_arg2); -+ -+void dns_rbt_traverse( dns_rbt_t *rbt, dns_rbt_traverse_callback_t cb, void *cb_arg1, void *cb_arg2 ); -+/* tree traversal function (only used by D-BUS dynamic forwarding dbus_mgr at -+ * the moment) ++isc_socketevent_t* ++isc_socket_fd_handle_selected( isc_socket_t *sock, isc_socketevent_t *dev ); ++/* register the "dev" event to be sent when ALL isc_sockettype_fd sockets ++ * have been select()-ed . If there is already an event registered, it ++ * is returned, otherwise 0 is returned. If dev is 0, removes any existing ++ * registered event. + */ + ISC_LANG_ENDDECLS - #endif /* DNS_RBT_H */ ---- bind-9.3.2b2/lib/isc/unix/socket.c.dbus 2005-11-15 12:43:36.000000000 -0500 -+++ bind-9.3.2b2/lib/isc/unix/socket.c 2005-11-15 12:45:05.000000000 -0500 -@@ -148,6 +148,11 @@ + #endif /* ISC_SOCKET_H */ +--- bind-9.4.0/lib/isc/unix/socket.c.dbus 2007-03-06 13:45:26.000000000 +0100 ++++ bind-9.4.0/lib/isc/unix/socket.c 2007-03-06 13:45:26.000000000 +0100 +@@ -159,6 +159,11 @@ ISC_LIST(isc_socketevent_t) recv_list; ISC_LIST(isc_socket_newconnev_t) accept_list; isc_socket_connev_t *connect_ev; @@ -214,7 +90,7 @@ /* * Internal events. Posted when a descriptor is readable or -@@ -304,7 +309,7 @@ +@@ -315,7 +320,7 @@ static void wakeup_socket(isc_socketmgr_t *manager, int fd, int msg) { @@ -223,7 +99,7 @@ /* * This is a wakeup on a socket. If the socket is not in the -@@ -1266,6 +1271,9 @@ +@@ -1311,6 +1316,9 @@ sock->connected = 0; sock->connecting = 0; sock->bound = 0; @@ -233,9 +109,9 @@ /* * initialize the lock -@@ -1378,13 +1386,16 @@ - case isc_sockettype_tcp: - sock->fd = socket(pf, SOCK_STREAM, IPPROTO_TCP); +@@ -1426,13 +1434,16 @@ + case isc_sockettype_unix: + sock->fd = socket(pf, SOCK_STREAM, 0); break; + + case isc_sockettype_fd: @@ -251,7 +127,7 @@ int new, tmp; new = fcntl(sock->fd, F_DUPFD, 20); tmp = errno; -@@ -1438,7 +1449,7 @@ +@@ -1486,7 +1497,7 @@ } } @@ -260,7 +136,7 @@ (void)close(sock->fd); free_socket(&sock); return (ISC_R_UNEXPECTED); -@@ -1706,6 +1717,38 @@ +@@ -1777,6 +1788,38 @@ isc_task_send(ev->ev_sender, (isc_event_t **)&iev); } @@ -299,7 +175,7 @@ /* * Dequeue an item off the given socket's read queue, set the result code * in the done event to the one provided, and send it to the task it was -@@ -2113,6 +2156,7 @@ +@@ -2184,6 +2227,7 @@ int i; isc_socket_t *sock; isc_boolean_t unlock_sock; @@ -307,7 +183,7 @@ REQUIRE(maxfd <= (int)FD_SETSIZE); -@@ -2146,11 +2190,15 @@ +@@ -2217,11 +2261,15 @@ unlock_sock = ISC_TRUE; LOCK(&sock->lock); if (!SOCK_DEAD(sock)) { @@ -324,7 +200,7 @@ FD_CLR(i, &manager->read_fds); } check_write: -@@ -2164,16 +2212,24 @@ +@@ -2235,16 +2283,24 @@ LOCK(&sock->lock); } if (!SOCK_DEAD(sock)) { @@ -349,7 +225,7 @@ } #ifdef ISC_PLATFORM_USETHREADS -@@ -2192,7 +2248,7 @@ +@@ -2263,7 +2319,7 @@ int cc; fd_set readfds; fd_set writefds; @@ -358,7 +234,7 @@ int maxfd; char strbuf[ISC_STRERRORSIZE]; -@@ -3523,3 +3579,55 @@ +@@ -3784,3 +3840,55 @@ return (ISC_R_SUCCESS); } #endif /* ISC_PLATFORM_USETHREADS */ @@ -414,63 +290,242 @@ + } + return dev; +} ---- bind-9.3.2b2/lib/isc/include/isc/socket.h.dbus 2004-03-08 04:04:53.000000000 -0500 -+++ bind-9.3.2b2/lib/isc/include/isc/socket.h 2005-11-15 12:45:05.000000000 -0500 -@@ -136,6 +136,10 @@ - #define ISC_SOCKEVENT_NEWCONN (ISC_EVENTCLASS_SOCKET + 3) - #define ISC_SOCKEVENT_CONNECT (ISC_EVENTCLASS_SOCKET + 4) - -+#define ISC_SOCKEVENT_READ_READY (ISC_EVENTCLASS_SOCKET + 5) -+#define ISC_SOCKEVENT_WRITE_READY (ISC_EVENTCLASS_SOCKET + 6) -+#define ISC_SOCKEVENT_SELECTED (ISC_EVENTCLASS_SOCKET + 7) +--- bind-9.4.0/lib/dns/forward.c.dbus 2005-07-12 03:22:20.000000000 +0200 ++++ bind-9.4.0/lib/dns/forward.c 2007-03-06 13:45:26.000000000 +0100 +@@ -197,3 +197,89 @@ + } + isc_mem_put(fwdtable->mctx, forwarders, sizeof(dns_forwarders_t)); + } + - /* - * Internal events. - */ -@@ -144,7 +148,8 @@ - - typedef enum { - isc_sockettype_udp = 1, -- isc_sockettype_tcp = 2 -+ isc_sockettype_tcp = 2, -+ isc_sockettype_fd = 8 - } isc_sockettype_t; - - /* -@@ -699,6 +704,30 @@ - * 'sock' is a valid socket. - */ - -+isc_socketevent_t* -+isc_socket_fd_handle_reads( isc_socket_t *sock, isc_socketevent_t *dev ); -+/* register the "dev" event to be sent when the isc_sockettype_fd sock -+ * was select()-ed for read. If there is already an event registered, it -+ * is returned, otherwise 0 is returned. If dev is 0, removes any existing -+ * registered event. -+ */ -+ -+isc_socketevent_t* -+isc_socket_fd_handle_writes( isc_socket_t *sock, isc_socketevent_t *dev ); -+/* register the "dev" event to be sent when the isc_sockettype_fd sock -+ * was select()-ed for write. If there is already an event registered, it -+ * is returned, otherwise 0 is returned. If dev is 0, removes any existing -+ * registered event. -+ */ ++/*** ++ *** new D-BUS Dynamic Forwarding Zones functions: ++ ***/ ++isc_result_t ++dns_fwdtable_delete(dns_fwdtable_t *fwdtable, dns_name_t *name ) ++{ ++ isc_result_t result; + -+isc_socketevent_t* -+isc_socket_fd_handle_selected( isc_socket_t *sock, isc_socketevent_t *dev ); -+/* register the "dev" event to be sent when ALL isc_sockettype_fd sockets -+ * have been select()-ed . If there is already an event registered, it -+ * is returned, otherwise 0 is returned. If dev is 0, removes any existing -+ * registered event. ++ REQUIRE(VALID_FWDTABLE(fwdtable)); ++ ++ RWLOCK(&fwdtable->rwlock, isc_rwlocktype_write); ++ ++ result = dns_rbt_deletename(fwdtable->table, name, ISC_FALSE); ++ ++ RWUNLOCK(&fwdtable->rwlock, isc_rwlocktype_write); ++ ++ return (result); ++} ++ ++isc_result_t ++dns_fwdtable_find_closest(dns_fwdtable_t *fwdtable, ++ dns_name_t *name, ++ dns_name_t *foundname, ++ dns_forwarders_t **forwardersp) ++{ ++ isc_result_t result; ++ ++ REQUIRE(VALID_FWDTABLE(fwdtable)); ++ ++ RWLOCK(&fwdtable->rwlock, isc_rwlocktype_read); ++ ++ result = dns_rbt_findname(fwdtable->table, name, 0, foundname, ++ (void **)forwardersp); ++ ++ if(result == DNS_R_PARTIALMATCH) ++ result = ISC_R_SUCCESS; ++ ++ RWUNLOCK(&fwdtable->rwlock, isc_rwlocktype_read); ++ ++ return (result); ++} ++ ++isc_result_t ++dns_fwdtable_find_exact(dns_fwdtable_t *fwdtable, dns_name_t *name, ++ dns_forwarders_t **forwardersp) ++{ ++ isc_result_t result; ++ ++ REQUIRE(VALID_FWDTABLE(fwdtable)); ++ ++ REQUIRE(forwardersp != 0L); ++ ++ RWLOCK(&fwdtable->rwlock, isc_rwlocktype_read); ++ ++ result = dns_rbt_findname(fwdtable->table, name, 0, NULL, ++ (void **)forwardersp); ++ ++ if( result != ISC_R_SUCCESS ) ++ *forwardersp = 0L; ++ ++ RWUNLOCK(&fwdtable->rwlock, isc_rwlocktype_read); ++ ++ return (result); ++} ++ ++static ++void dns_fwdtable_traverse ++( ++ dns_name_t *name, ++ void *node_data, ++ void *cbp, ++ void *cb_arg ++) ++{ ++ dns_fwdtable_callback_t cb = (dns_fwdtable_callback_t) cbp; ++ ++ (*cb)( name, node_data, cb_arg); ++} ++ ++void dns_fwdtable_foreach(dns_fwdtable_t *fwdtable, dns_fwdtable_callback_t cb, void *cb_arg ) ++{ ++ REQUIRE(VALID_FWDTABLE(fwdtable)); ++ ++ dns_rbt_traverse( fwdtable->table, dns_fwdtable_traverse, cb, cb_arg ); ++} +--- bind-9.4.0/lib/dns/rbt.c.dbus 2005-10-13 03:26:06.000000000 +0200 ++++ bind-9.4.0/lib/dns/rbt.c 2007-03-06 13:45:26.000000000 +0100 +@@ -2175,6 +2175,47 @@ + dns_rbt_printtree(rbt->root, NULL, 0); + } + ++static void ++dns_rbt_traverse_tree(dns_rbtnode_t *root, dns_rbt_traverse_callback_t cb, void *cb_arg1, void *cb_arg2 ) { ++/* ++ * This is used ONLY to traverse the forward table by dbus_mgr at the moment. ++ * Since the forward table is not likely to be large, this can be recursive. ++ */ ++ dns_name_t name; ++ dns_offsets_t offsets; ++ char buf[DNS_NAME_MAXWIRE]; ++ isc_buffer_t buffer; ++ ++ if (root != NULL) { ++ ++ if (DOWN(root)) ++ dns_rbt_traverse_tree(DOWN(root), cb, cb_arg1, cb_arg2); ++ ++ if( LEFT(root) != NULL ) ++ dns_rbt_traverse_tree(LEFT(root), cb, cb_arg1, cb_arg2); ++ ++ if( RIGHT(root) != NULL ) ++ dns_rbt_traverse_tree(RIGHT(root), cb, cb_arg1, cb_arg2); ++ ++ if( DATA(root) == 0L ) ++ return; ++ ++ dns_name_init(&name, offsets); ++ isc_buffer_init(&buffer, buf, DNS_NAME_MAXWIRE); ++ dns_name_setbuffer( &name, &buffer); ++ dns_rbt_fullnamefromnode(root, &name); ++ ++ (*cb)(&name, DATA(root), cb_arg1, cb_arg2); ++ } ++} ++ ++void dns_rbt_traverse( dns_rbt_t *rbt, dns_rbt_traverse_callback_t cb, void *cb_arg1, void *cb_arg2 ) ++{ ++ REQUIRE(VALID_RBT(rbt)); ++ ++ dns_rbt_traverse_tree( rbt->root, cb, cb_arg1, cb_arg2 ); ++} ++ + /* + * Chain Functions + */ +--- bind-9.4.0/lib/dns/include/dns/rbt.h.dbus 2005-10-13 03:26:07.000000000 +0200 ++++ bind-9.4.0/lib/dns/include/dns/rbt.h 2007-03-06 13:45:26.000000000 +0100 +@@ -911,6 +911,17 @@ + } while (0) + #endif /* DNS_RBT_USEISCREFCOUNT */ + ++ ++typedef void (*dns_rbt_traverse_callback_t)( dns_name_t *name, ++ void *node_data, ++ void *cb_arg1, ++ void *cb_arg2); ++ ++void dns_rbt_traverse( dns_rbt_t *rbt, dns_rbt_traverse_callback_t cb, void *cb_arg1, void *cb_arg2 ); ++/* tree traversal function (only used by D-BUS dynamic forwarding dbus_mgr at ++ * the moment) + */ + ISC_LANG_ENDDECLS - #endif /* ISC_SOCKET_H */ ---- bind-9.3.2b2/bin/named/log.c.dbus 2005-05-24 19:58:17.000000000 -0400 -+++ bind-9.3.2b2/bin/named/log.c 2005-11-15 12:45:05.000000000 -0500 -@@ -41,6 +41,7 @@ + #endif /* DNS_RBT_H */ +--- bind-9.4.0/lib/dns/include/dns/forward.h.dbus 2005-04-27 07:01:33.000000000 +0200 ++++ bind-9.4.0/lib/dns/include/dns/forward.h 2007-03-06 13:45:26.000000000 +0100 +@@ -113,6 +113,37 @@ + * \li all memory associated with the forwarding table is freed. + */ + ++ ++/* These are ONLY used by dbus_mgr : ++ */ ++ ++isc_result_t ++dns_fwdtable_delete( dns_fwdtable_t *fwdtable, dns_name_t *name ); ++/* ++ * Removes an entry from the forwarding table. ++ */ ++ ++isc_result_t ++dns_fwdtable_find_exact(dns_fwdtable_t *fwdtable, dns_name_t *name, ++ dns_forwarders_t **forwardersp); ++/* ++ * Finds an exact match for "name" in the forwarding table. ++ */ ++ ++isc_result_t ++dns_fwdtable_find_closest(dns_fwdtable_t *fwdtable, dns_name_t *name, dns_name_t *foundname, ++ dns_forwarders_t **forwardersp); ++/* ++ * Finds the closest match for "*name" in the forwarding table, returning ++ * the actual name matching in *name if different to *name passed in. ++ */ ++ ++typedef void (*dns_fwdtable_callback_t)( dns_name_t *, dns_forwarders_t *, void *); ++void dns_fwdtable_foreach(dns_fwdtable_t *fwdtable, dns_fwdtable_callback_t cb, void * ); ++/* Invoke cb for each member of fwdtable ++ */ ++ ++ + ISC_LANG_ENDDECLS + + #endif /* DNS_FORWARD_H */ +--- bind-9.4.0/bin/named/main.c.dbus 2006-11-10 19:51:14.000000000 +0100 ++++ bind-9.4.0/bin/named/main.c 2007-03-06 14:11:18.000000000 +0100 +@@ -248,7 +248,8 @@ + "usage: named [-4|-6] [-c conffile] [-d debuglevel] " + "[-f|-g] [-n number_of_cpus]\n" + " [-p port] [-s] [-t chrootdir] [-u username]\n" +- " [-m {usage|trace|record|size|mctx}]\n"); ++ " [-m {usage|trace|record|size|mctx}]\n" ++ " [-D ]\n"); + } + + static void +@@ -356,7 +357,7 @@ + + isc_commandline_errprint = ISC_FALSE; + while ((ch = isc_commandline_parse(argc, argv, +- "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:")) != -1) { ++ "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:D")) != -1) { + switch (ch) { + case '4': + if (disable4) +@@ -445,6 +446,9 @@ + case 'v': + printf("BIND %s\n", ns_g_version); + exit(0); ++ case 'D': ++ ns_g_dbus = 1; ++ break; + case '?': + usage(); + ns_main_earlyfatal("unknown option '-%c'", +--- bind-9.4.0/bin/named/log.c.dbus 2006-06-09 02:54:08.000000000 +0200 ++++ bind-9.4.0/bin/named/log.c 2007-03-06 13:45:26.000000000 +0100 +@@ -44,6 +44,7 @@ { "queries", 0 }, { "unmatched", 0 }, { "update-security", 0 }, @@ -478,7 +533,7 @@ { NULL, 0 } }; -@@ -60,6 +61,7 @@ +@@ -63,6 +64,7 @@ { "notify", 0 }, { "control", 0 }, { "lwresd", 0 }, @@ -486,19 +541,126 @@ { NULL, 0 } }; ---- bind-9.3.2b2/bin/named/Makefile.in.dbus 2005-11-15 12:43:36.000000000 -0500 -+++ bind-9.3.2b2/bin/named/Makefile.in 2005-11-15 12:45:05.000000000 -0500 -@@ -35,7 +35,8 @@ - ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ - ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ - ${DBDRIVER_INCLUDES} +--- bind-9.4.0/bin/named/include/named/server.h.dbus 2006-03-10 00:46:20.000000000 +0100 ++++ bind-9.4.0/bin/named/include/named/server.h 2007-03-06 14:12:02.000000000 +0100 +@@ -97,6 +97,8 @@ + ns_dispatchlist_t dispatches; + + dns_acache_t *acache; ++ ++ ns_dbus_mgr_t * dbus_mgr; + }; + + #define NS_SERVER_MAGIC ISC_MAGIC('S','V','E','R') +--- bind-9.4.0/bin/named/include/named/types.h.dbus 2005-04-29 02:15:38.000000000 +0200 ++++ bind-9.4.0/bin/named/include/named/types.h 2007-03-06 13:45:26.000000000 +0100 +@@ -40,4 +40,6 @@ + typedef struct ns_dispatch ns_dispatch_t; + typedef ISC_LIST(ns_dispatch_t) ns_dispatchlist_t; + ++typedef struct ns_dbus_mgr ns_dbus_mgr_t ; ++ + #endif /* NAMED_TYPES_H */ +--- bind-9.4.0/bin/named/include/named/globals.h.dbus 2007-03-06 13:45:26.000000000 +0100 ++++ bind-9.4.0/bin/named/include/named/globals.h 2007-03-06 13:45:26.000000000 +0100 +@@ -114,6 +114,8 @@ + + EXTERN int ns_g_listen INIT(3); + ++EXTERN int ns_g_dbus INIT(0); ++ + #undef EXTERN + #undef INIT + +--- bind-9.4.0/bin/named/include/named/log.h.dbus 2005-04-29 02:15:35.000000000 +0200 ++++ bind-9.4.0/bin/named/include/named/log.h 2007-03-06 13:45:26.000000000 +0100 +@@ -36,6 +36,7 @@ + #define NS_LOGCATEGORY_QUERIES (&ns_g_categories[4]) + #define NS_LOGCATEGORY_UNMATCHED (&ns_g_categories[5]) + #define NS_LOGCATEGORY_UPDATE_SECURITY (&ns_g_categories[6]) ++#define NS_LOGCATEGORY_DBUS (&ns_g_categories[7]) + + /* + * Backwards compatibility. +@@ -53,6 +54,7 @@ + #define NS_LOGMODULE_NOTIFY (&ns_g_modules[8]) + #define NS_LOGMODULE_CONTROL (&ns_g_modules[9]) + #define NS_LOGMODULE_LWRESD (&ns_g_modules[10]) ++#define NS_LOGMODULE_DBUS (&ns_g_modules[11]) + + isc_result_t + ns_log_init(isc_boolean_t safe); +--- bind-9.4.0/bin/named/server.c.dbus 2006-12-07 06:24:19.000000000 +0100 ++++ bind-9.4.0/bin/named/server.c 2007-03-06 13:45:26.000000000 +0100 +@@ -167,6 +167,8 @@ + ISC_LINK(struct zonelistentry) link; + }; + ++#include ++ + /* + * These zones should not leak onto the Internet. + */ +@@ -1985,12 +1987,12 @@ + if (result != ISC_R_SUCCESS) { + char namebuf[DNS_NAME_FORMATSIZE]; + dns_name_format(origin, namebuf, sizeof(namebuf)); +- cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_WARNING, +- "could not set up forwarding for domain '%s': %s", ++ cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_NOTICE, ++ "setting up forwarding failed for domain '%s': %s", + namebuf, isc_result_totext(result)); + goto cleanup; + } - ++ + result = ISC_R_SUCCESS; + + cleanup: +@@ -3418,6 +3420,20 @@ + + CHECKFATAL(load_zones(server, ISC_FALSE), "loading zones"); + ++ server->dbus_mgr = 0L; ++ if( ns_g_dbus ) ++ if( dbus_mgr_create ++ ( ns_g_mctx, ns_g_taskmgr, ns_g_socketmgr, ns_g_timermgr, ++ &server->dbus_mgr ++ ) != ISC_R_SUCCESS ++ ) ++ { ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, ++ NS_LOGMODULE_SERVER, ISC_LOG_WARNING, ++ "dbus_mgr initialization failed. D-BUS service is disabled." ++ ); ++ } ++ + ns_os_started(); + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + ISC_LOG_NOTICE, "running"); +@@ -3481,6 +3497,9 @@ + + dns_db_detach(&server->in_roothints); + ++ if( server->dbus_mgr != 0L ) ++ dbus_mgr_shutdown(server->dbus_mgr); ++ + isc_task_endexclusive(server->task); + + isc_task_detach(&server->task); +--- bind-9.4.0/bin/named/Makefile.in.dbus 2007-03-06 13:45:26.000000000 +0100 ++++ bind-9.4.0/bin/named/Makefile.in 2007-03-06 14:08:10.000000000 +0100 +@@ -43,6 +43,9 @@ + ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ + ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} + +DBUS_INCLUDES = \ -+ -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 - CDEFINES = - CWARNINGS = ++ -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 ++ + CDEFINES = @USE_DLZ@ -@@ -52,6 +53,7 @@ + CWARNINGS = +@@ -60,6 +63,7 @@ ISCDEPLIBS = ../../lib/isc/libisc. at A@ LWRESDEPLIBS = ../../lib/lwres/liblwres. at A@ BIND9DEPLIBS = ../../lib/bind9/libbind9. at A@ @@ -506,25 +668,23 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \ ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS} -@@ -70,7 +72,8 @@ - tkeyconf.o tsigconf.o update.o xfrout.o \ +@@ -80,6 +84,7 @@ zoneconf.o \ lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \ -- lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \ -+ lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \ + lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \ + dbus_service.o dbus_mgr.o \ - $(DBDRIVER_OBJS) + ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS} UOBJS = unix/os.o -@@ -83,6 +86,7 @@ +@@ -92,6 +97,7 @@ zoneconf.c \ lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \ -+ dbus_service.c dbus_mgr.c \ - $(DBDRIVER_SRCS) ++ dbus_service.c dbus_mgr.c \ + ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS} MANPAGES = named.8 lwresd.8 named.conf.5 -@@ -111,9 +115,14 @@ +@@ -120,9 +126,14 @@ -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ -c ${srcdir}/config.c @@ -540,9 +700,9 @@ lwresd at EXEEXT@: named at EXEEXT@ rm -f lwresd at EXEEXT@ ---- bind-9.3.2b2/bin/named/named.8.dbus 2005-10-12 22:33:46.000000000 -0400 -+++ bind-9.3.2b2/bin/named/named.8 2005-11-15 12:48:31.000000000 -0500 -@@ -30,7 +30,7 @@ +--- bind-9.4.0/bin/named/named.8.dbus 2007-01-30 01:23:44.000000000 +0100 ++++ bind-9.4.0/bin/named/named.8 2007-03-06 13:45:26.000000000 +0100 +@@ -33,7 +33,7 @@ named \- Internet domain name server .SH "SYNOPSIS" .HP 6 @@ -551,10 +711,10 @@ .SH "DESCRIPTION" .PP \fBnamed\fR -@@ -143,6 +143,13 @@ - .B "Warning:" +@@ -172,6 +172,13 @@ This option must not be used. It is only of interest to BIND 9 developers and may be removed or changed in a future release. .RE + .RE +.sp +.TP +\fB\-D\fR @@ -565,7 +725,7 @@ .SH "SIGNALS" .PP In routine operation, signals should not be used to control the nameserver; -@@ -162,6 +169,73 @@ +@@ -195,6 +202,73 @@ \fBnamed\fR configuration file is too complex to describe in detail here. A complete description is provided in the BIND 9 Administrator Reference Manual. @@ -637,145 +797,5 @@ +by selecting the Help menu. +.PP .SH "FILES" - .TP + .PP \fI/etc/named.conf\fR ---- bind-9.3.2b2/bin/named/main.c.dbus 2005-04-28 21:04:47.000000000 -0400 -+++ bind-9.3.2b2/bin/named/main.c 2005-11-15 12:45:05.000000000 -0500 -@@ -239,7 +239,8 @@ - "usage: named [-4|-6] [-c conffile] [-d debuglevel] " - "[-f|-g] [-n number_of_cpus]\n" - " [-p port] [-s] [-t chrootdir] [-u username]\n" -- " [-m {usage|trace|record}]\n"); -+ " [-m {usage|trace|record}]\n" -+ " [-D ]\n"); - } - - static void -@@ -345,7 +346,7 @@ - - isc_commandline_errprint = ISC_FALSE; - while ((ch = isc_commandline_parse(argc, argv, -- "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:")) != -1) { -+ "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:D")) != -1) { - switch (ch) { - case '4': - if (disable4) -@@ -434,6 +435,9 @@ - case 'v': - printf("BIND %s\n", ns_g_version); - exit(0); -+ case 'D': -+ ns_g_dbus = 1; -+ break; - case '?': - usage(); - ns_main_earlyfatal("unknown option '-%c'", ---- bind-9.3.2b2/bin/named/server.c.dbus 2005-07-26 22:53:15.000000000 -0400 -+++ bind-9.3.2b2/bin/named/server.c 2005-11-15 12:45:05.000000000 -0500 -@@ -86,6 +86,8 @@ - #include - #endif - -+#include -+ - /* - * Check an operation for failure. Assumes that the function - * using it has a 'result' variable and a 'cleanup' label. -@@ -1496,12 +1498,12 @@ - if (result != ISC_R_SUCCESS) { - char namebuf[DNS_NAME_FORMATSIZE]; - dns_name_format(origin, namebuf, sizeof(namebuf)); -- cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_WARNING, -- "could not set up forwarding for domain '%s': %s", -+ cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_NOTICE, -+ "setting up forwarding failed for domain '%s': %s", - namebuf, isc_result_totext(result)); - goto cleanup; - } -- -+ - result = ISC_R_SUCCESS; - - cleanup: -@@ -2873,6 +2875,20 @@ - - CHECKFATAL(load_zones(server, ISC_FALSE), "loading zones"); - -+ server->dbus_mgr = 0L; -+ if( ns_g_dbus ) -+ if( dbus_mgr_create -+ ( ns_g_mctx, ns_g_taskmgr, ns_g_socketmgr, ns_g_timermgr, -+ &server->dbus_mgr -+ ) != ISC_R_SUCCESS -+ ) -+ { -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, -+ NS_LOGMODULE_SERVER, ISC_LOG_WARNING, -+ "dbus_mgr initialization failed. D-BUS service is disabled." -+ ); -+ } -+ - ns_os_started(); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_NOTICE, "running"); -@@ -2935,6 +2951,9 @@ - - dns_db_detach(&server->in_roothints); - -+ if( server->dbus_mgr != 0L ) -+ dbus_mgr_shutdown(server->dbus_mgr); -+ - isc_task_endexclusive(server->task); - - isc_task_detach(&server->task); ---- bind-9.3.2b2/bin/named/include/named/globals.h.dbus 2005-11-15 12:43:36.000000000 -0500 -+++ bind-9.3.2b2/bin/named/include/named/globals.h 2005-11-15 12:45:05.000000000 -0500 -@@ -112,6 +112,8 @@ - - EXTERN int ns_g_listen INIT(3); - -+EXTERN int ns_g_dbus INIT(0); -+ - #undef EXTERN - #undef INIT - ---- bind-9.3.2b2/bin/named/include/named/server.h.dbus 2004-03-07 23:04:21.000000000 -0500 -+++ bind-9.3.2b2/bin/named/include/named/server.h 2005-11-15 12:45:05.000000000 -0500 -@@ -91,7 +91,8 @@ - ns_controls_t * controls; /* Control channels */ - unsigned int dispatchgen; - ns_dispatchlist_t dispatches; -- -+ -+ ns_dbus_mgr_t * dbus_mgr; - }; - - #define NS_SERVER_MAGIC ISC_MAGIC('S','V','E','R') ---- bind-9.3.2b2/bin/named/include/named/log.h.dbus 2004-03-07 23:04:21.000000000 -0500 -+++ bind-9.3.2b2/bin/named/include/named/log.h 2005-11-15 12:45:05.000000000 -0500 -@@ -34,6 +34,7 @@ - #define NS_LOGCATEGORY_QUERIES (&ns_g_categories[4]) - #define NS_LOGCATEGORY_UNMATCHED (&ns_g_categories[5]) - #define NS_LOGCATEGORY_UPDATE_SECURITY (&ns_g_categories[6]) -+#define NS_LOGCATEGORY_DBUS (&ns_g_categories[7]) - - /* - * Backwards compatibility. -@@ -51,6 +52,7 @@ - #define NS_LOGMODULE_NOTIFY (&ns_g_modules[8]) - #define NS_LOGMODULE_CONTROL (&ns_g_modules[9]) - #define NS_LOGMODULE_LWRESD (&ns_g_modules[10]) -+#define NS_LOGMODULE_DBUS (&ns_g_modules[11]) - - isc_result_t - ns_log_init(isc_boolean_t safe); ---- bind-9.3.2b2/bin/named/include/named/types.h.dbus 2004-03-06 05:21:26.000000000 -0500 -+++ bind-9.3.2b2/bin/named/include/named/types.h 2005-11-15 12:45:05.000000000 -0500 -@@ -38,4 +38,6 @@ - typedef struct ns_dispatch ns_dispatch_t; - typedef ISC_LIST(ns_dispatch_t) ns_dispatchlist_t; - -+typedef struct ns_dbus_mgr ns_dbus_mgr_t ; -+ - #endif /* NAMED_TYPES_H */ - bind-9.3.3rc2-rndckey.patch: rndc-confgen.8 | 2 +- rndc-confgen.c | 2 +- rndc-confgen.docbook | 2 +- rndc.conf | 9 +++------ 4 files changed, 6 insertions(+), 9 deletions(-) Index: bind-9.3.3rc2-rndckey.patch =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.3rc2-rndckey.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-9.3.3rc2-rndckey.patch 15 Sep 2006 14:44:12 -0000 1.1 +++ bind-9.3.3rc2-rndckey.patch 6 Mar 2007 15:32:16 -0000 1.2 @@ -1,17 +1,28 @@ ---- bind-9.3.3rc2/bin/rndc/rndc-confgen.c.key 2004-09-28 09:14:57.000000000 +0200 -+++ bind-9.3.3rc2/bin/rndc/rndc-confgen.c 2006-09-15 08:56:25.000000000 +0200 -@@ -46,7 +46,7 @@ +--- bind-9.4.0/bin/rndc/rndc-confgen.8.key 2007-01-30 01:23:44.000000000 +0100 ++++ bind-9.4.0/bin/rndc/rndc-confgen.8 2007-03-06 12:42:15.000000000 +0100 +@@ -125,7 +125,7 @@ + \-k \fIkeyname\fR + .RS 4 + Specifies the key name of the rndc authentication key. This must be a valid domain name. The default is +-\fBrndc\-key\fR. ++\fBrndckey\fR. + .RE + .PP + \-p \fIport\fR +--- bind-9.4.0/bin/rndc/rndc-confgen.c.key 2005-04-29 02:15:40.000000000 +0200 ++++ bind-9.4.0/bin/rndc/rndc-confgen.c 2007-03-06 12:41:33.000000000 +0100 +@@ -57,7 +57,7 @@ #include "util.h" - #define DEFAULT_KEYLENGTH 128 /* Bits. */ + #define DEFAULT_KEYLENGTH 128 /*% Bits. */ -#define DEFAULT_KEYNAME "rndc-key" +#define DEFAULT_KEYNAME "rndckey" #define DEFAULT_SERVER "127.0.0.1" #define DEFAULT_PORT 953 ---- bind-9.3.3rc2/bin/rndc/rndc.conf.key 2004-03-06 11:21:32.000000000 +0100 -+++ bind-9.3.3rc2/bin/rndc/rndc.conf 2006-09-15 08:56:25.000000000 +0200 -@@ -23,14 +23,11 @@ +--- bind-9.4.0/bin/rndc/rndc.conf.key 2004-06-18 06:39:39.000000000 +0200 ++++ bind-9.4.0/bin/rndc/rndc.conf 2007-03-06 12:44:06.000000000 +0100 +@@ -23,11 +23,11 @@ options { default-server localhost; @@ -24,30 +35,24 @@ + key "rndckey"; }; + key "cc64b3d1db63fc88d7cb5d2f9f57d258" { +@@ -41,7 +41,4 @@ + addresses { 10.53.0.1; }; + }; + -key "key" { - algorithm hmac-md5; - secret "c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K"; -}; +include "/etc/rndc.key"; ---- bind-9.3.3rc2/bin/rndc/rndc-confgen.8.key 2006-09-15 09:00:01.000000000 +0200 -+++ bind-9.3.3rc2/bin/rndc/rndc-confgen.8 2006-09-15 08:56:25.000000000 +0200 -@@ -116,7 +116,7 @@ - .TP 3n - \-k \fIkeyname\fR - Specifies the key name of the rndc authentication key. This must be a valid domain name. The default is --\fBrndc\-key\fR. -+\fBrndckey\fR. - .TP 3n - \-p \fIport\fR - Specifies the command channel port where ---- bind-9.3.3rc2/bin/rndc/rndc-confgen.docbook.key 2005-05-13 03:22:34.000000000 +0200 -+++ bind-9.3.3rc2/bin/rndc/rndc-confgen.docbook 2006-09-15 08:56:25.000000000 +0200 -@@ -160,7 +160,7 @@ - - Specifies the key name of the rndc authentication key. - This must be a valid domain name. -- The default is rndc-key. -+ The default is rndckey. - - +--- bind-9.4.0/bin/rndc/rndc-confgen.docbook.key 2007-01-30 00:57:20.000000000 +0100 ++++ bind-9.4.0/bin/rndc/rndc-confgen.docbook 2007-03-06 12:44:45.000000000 +0100 +@@ -163,7 +163,7 @@ + + Specifies the key name of the rndc authentication key. + This must be a valid domain name. +- The default is rndc-key. ++ The default is rndckey. + + bind-bsdcompat.patch: socket.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: bind-bsdcompat.patch =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-bsdcompat.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-bsdcompat.patch 9 Sep 2004 03:34:55 -0000 1.1 +++ bind-bsdcompat.patch 6 Mar 2007 15:32:16 -0000 1.2 @@ -1,11 +1,11 @@ ---- bind-9.2.2/lib/isc/unix/socket.c.bsdcompat 2003-02-18 02:28:41.000000000 -0500 -+++ bind-9.2.2/lib/isc/unix/socket.c 2003-07-19 15:40:49.784907968 -0400 -@@ -1365,7 +1365,7 @@ isc_socket_create(isc_socketmgr_t *manag +--- bind-9.4.0/lib/isc/unix/socket.c.bsdcompat 2006-06-06 02:56:09.000000000 +0200 ++++ bind-9.4.0/lib/isc/unix/socket.c 2007-03-06 12:53:12.000000000 +0100 +@@ -1492,7 +1492,7 @@ return (ISC_R_UNEXPECTED); } -#ifdef SO_BSDCOMPAT +#if 0 - if (setsockopt(sock->fd, SOL_SOCKET, SO_BSDCOMPAT, - (void *)&on, sizeof on) < 0) { - isc__strerror(errno, strbuf, sizeof(strbuf)); + if (type != isc_sockettype_unix && + setsockopt(sock->fd, SOL_SOCKET, SO_BSDCOMPAT, + (void *)&on, sizeof(on)) < 0) { Index: bind-chroot-admin.in =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bind-chroot-admin.in 15 Feb 2007 15:46:08 -0000 1.17 +++ bind-chroot-admin.in 6 Mar 2007 15:32:16 -0000 1.18 @@ -96,9 +96,9 @@ [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] && [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime"; /bin/chown --preserve-root root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero}; /bin/chmod --preserve-root 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero}; - if selinux_enabled && [ -x /usr/bin/chcon ]; then + if selinux_enabled && [ -x /sbin/restorecon ]; then for dev in random zero null; do - /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev; + /sbin/restorecon ${BIND_CHROOT_PREFIX}/dev/$dev; done fi; } @@ -260,16 +260,16 @@ if selinux_enabled && [ -x /sbin/restorecon ]; then /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/etc ${BIND_CHROOT_PREFIX}/var/named ${BIND_CHROOT_PREFIX}/var/run/named >/dev/null 2>&1; if [ -e ${BIND_CHROOT_PREFIX}/etc/localtime ] && [ -e /etc/localtime ] ; then - /usr/bin/chcon --reference=/etc/localtime ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1; + /usr/bin/ ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1; fi; - /usr/bin/chcon -h --reference=/etc/named.conf /etc/named.* >/dev/null 2>&1; - /usr/bin/chcon -h --reference=/etc/rndc.key /etc/rndc.key >/dev/null 2>&1; - /usr/bin/chcon -h --reference=/etc/rndc.conf /etc/rndc.conf >/dev/null 2>&1; - /usr/bin/chcon -h --reference=/var/named /var/named{/,/*} >/dev/null 2>&1; - /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/slaves /var/named/{slaves,data}{/,/*} >/dev/null 2>&1; + /sbin/restorecon /etc/named.* >/dev/null 2>&1; + /sbin/restorecon /etc/rndc.key >/dev/null 2>&1; + /sbin/restorecon /etc/rndc.conf >/dev/null 2>&1; + /sbin/restorecon /var/named{/,/*} >/dev/null 2>&1; + /sbin/restorecon /var/named/{slaves,data}{/,/*} >/dev/null 2>&1; /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca >/dev/null 2>&1; /sbin/restorecon ${BIND_CHROOT_PREFIX} >/dev/null 2>&1; - /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/named.ca /var/named/named.ca >/dev/null 2>&1; + /sbin/restorecon /var/named/named.ca >/dev/null 2>&1; fi; /sbin/service named condrestart rm -f $changed; Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- bind.spec 15 Feb 2007 15:46:08 -0000 1.163 +++ bind.spec 6 Mar 2007 15:32:16 -0000 1.164 @@ -16,14 +16,14 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server. Name: bind License: BSD-like -Version: 9.3.4 -Release: 7%{?dist} +Version: 9.4.0 +Release: 8%{?dist} Epoch: 31 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 @@ -68,8 +68,8 @@ Patch15: bind-9.3.3rc2-dbus.patch Patch16: bind-9.3.2-redhat_doc.patch Patch17: bind-9.3.2b1-fix_sdb_ldap.patch -Patch19: bind-9.3.1-next_server_on_referral.patch -Patch20: bind-9.3.2b2-no_servfail_stops.patch +#Patch19: bind-9.3.1-next_server_on_referral.patch +#Patch20: bind-9.3.2b2-no_servfail_stops.patch Patch22: bind-9.3.1-sdb_dbus.patch Patch23: bind-9.3.1-dbus_archdep_libdir.patch Patch32: bind-9.3.2-prctl_set_dumpable.patch @@ -257,8 +257,8 @@ %if %{SDB} %patch17 -p1 -b .fix_sdb_ldap %endif -%patch19 -p1 -b .next_server_on_referral -%patch20 -p1 -b .no_servfail_stops +#%patch19 -p1 -b .next_server_on_referral +#%patch20 -p1 -b .no_servfail_stops %if %{WITH_DBUS} # # this must follow all dbus patches: @@ -481,6 +481,7 @@ %{_sbindir}/named-bootconf %{_sbindir}/rndc* %{_sbindir}/bind-chroot-admin +%{_sbindir}/named-compilezone %defattr(0644,root,root,0755) %{_mandir}/man5/named.conf.5* %{_mandir}/man5/rndc.conf.5* @@ -490,6 +491,7 @@ %{_mandir}/man8/dnssec*.8* %{_mandir}/man8/named-checkconf.8* %{_mandir}/man8/named-checkzone.8* +%{_mandir}/man8/named-compilezone.8* %{_mandir}/man8/rndc-confgen.8* %doc CHANGES COPYRIGHT README %doc doc/arm doc/misc @@ -744,6 +746,10 @@ :; %changelog +* Tue Mar 06 2007 Adam Tkac 31:9.3.4-8.fc7 +- updated to 9.4.0 +- bind-chroot-admin now sets EAs correctly (#213926) + * Thu Feb 15 2007 Adam Tkac 31:9.3.4-7.fc7 - minor cleanup in bind-chroot-admin script Index: sources =================================================================== RCS file: /cvs/dist/rpms/bind/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 25 Jan 2007 18:00:56 -0000 1.31 +++ sources 6 Mar 2007 15:32:16 -0000 1.32 @@ -1,3 +1,3 @@ -df5417e7e7cf017fa28b65d0a3d6e999 bind-9.3.4.tar.gz -3567c35a24cb83a8a69443a399bbb6c8 bind-chroot.tar.gz +e85347f03f0d841b596422d5252a0869 bind-9.4.0.tar.gz 13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz +3567c35a24cb83a8a69443a399bbb6c8 bind-chroot.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 6 15:33:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 10:33:18 -0500 Subject: rpms/libgconf-java/devel libgconf-java-gjavah.patch, NONE, 1.1 libgconf-java-javah.patch, 1.1, NONE Message-ID: <200703061533.l26FXIZ3022679@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/libgconf-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22651 Added Files: libgconf-java-gjavah.patch Removed Files: libgconf-java-javah.patch Log Message: Rename the the filename of the gjavah patch. libgconf-java-gjavah.patch: configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE libgconf-java-gjavah.patch --- --- ./configure.ac.orig 2006-08-03 04:58:13.000000000 +0200 +++ ./configure.ac 2007-03-05 20:31:37.959117000 +0100 @@ -55,7 +55,7 @@ AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) -AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni]) +AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([gconf-java.pc]) --- ./configure.orig 2006-08-03 08:52:30.000000000 +0200 +++ ./configure 2007-03-05 20:31:31.442642000 +0100 @@ -22210,7 +22210,7 @@ -for ac_prog in "gcjh -jni" "javah" +for ac_prog in "gjavah -jni" "javah" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -22249,7 +22249,7 @@ test -n "$JAVAH" && break done -test -n "$JAVAH" || JAVAH="gcjh -jni" +test -n "$JAVAH" || JAVAH="gjavah -jni" ac_config_files="$ac_config_files Makefile" --- libgconf-java-javah.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 6 15:34:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 10:34:16 -0500 Subject: rpms/bind/devel bind.spec,1.164,1.165 Message-ID: <200703061534.l26FYGDt023338@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23217/bind/devel Modified Files: bind.spec Log Message: changelog update Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- bind.spec 6 Mar 2007 15:32:16 -0000 1.164 +++ bind.spec 6 Mar 2007 15:34:14 -0000 1.165 @@ -749,6 +749,7 @@ * Tue Mar 06 2007 Adam Tkac 31:9.3.4-8.fc7 - updated to 9.4.0 - bind-chroot-admin now sets EAs correctly (#213926) +- throw away next_server_on_referral and no_servfail_stops patches (fixed in 9.4.0) * Thu Feb 15 2007 Adam Tkac 31:9.3.4-7.fc7 - minor cleanup in bind-chroot-admin script From fedora-cvs-commits at redhat.com Tue Mar 6 15:35:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 10:35:09 -0500 Subject: rpms/bind/devel bind.spec,1.165,1.166 Message-ID: <200703061535.l26FZ9m5023970@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23807/bind/devel Modified Files: bind.spec Log Message: release number have been corrected Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- bind.spec 6 Mar 2007 15:34:14 -0000 1.165 +++ bind.spec 6 Mar 2007 15:35:07 -0000 1.166 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.4.0 -Release: 8%{?dist} +Release: 1%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -746,7 +746,7 @@ :; %changelog -* Tue Mar 06 2007 Adam Tkac 31:9.3.4-8.fc7 +* Tue Mar 06 2007 Adam Tkac 31:9.4.0-1.fc7 - updated to 9.4.0 - bind-chroot-admin now sets EAs correctly (#213926) - throw away next_server_on_referral and no_servfail_stops patches (fixed in 9.4.0) From fedora-cvs-commits at redhat.com Tue Mar 6 15:42:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 10:42:21 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch, NONE, 1.1 openoffice.org.spec, 1.1090, 1.1091 Message-ID: <200703061542.l26FgLog021223@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21206 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch Log Message: restore back to the right workspace openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch: Source/vcl/unx/source/app/sm.cxx | 0 framework/source/services/autorecovery.cxx | 47 +++++++++++++++++++++++++++++ source/services/autorecovery.cxx | 0 vcl/unx/source/app/sm.cxx | 17 ++++++---- 4 files changed, 57 insertions(+), 7 deletions(-) --- NEW FILE openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch --- Index: Source/vcl/unx/source/app/sm.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/source/app/sm.cxx,v retrieving revision 1.29 diff -u -r1.29 sm.cxx --- openoffice.org.orig/vcl/unx/source/app/sm.cxx 6 Oct 2006 10:04:48 -0000 1.29 +++ openoffice.org/vcl/unx/source/app/sm.cxx 28 Feb 2007 14:16:07 -0000 @@ -239,14 +239,17 @@ pSmProps[ 2 ].name = const_cast(SmRestartCommand); pSmProps[ 2 ].type = const_cast(SmLISTofARRAY8); - pSmProps[ 2 ].num_vals = 2; - pSmProps[ 2 ].vals = new SmPropValue[2]; + pSmProps[ 2 ].num_vals = 3; + pSmProps[ 2 ].vals = new SmPropValue[3]; pSmProps[ 2 ].vals[0].length = aExec.Len()+1; - pSmProps[ 2 ].vals[0].value = strdup( aExec.GetBuffer() ); - ByteString aRestartOption( "-session=" ); - aRestartOption.Append( SessionManagerClient::getSessionID() ); - pSmProps[ 2 ].vals[1].length = aRestartOption.Len()+1; - pSmProps[ 2 ].vals[1].value = strdup( aRestartOption.GetBuffer() ); + pSmProps[ 2 ].vals[0].value = strdup( aExec.GetBuffer() ); + ByteString aRestartOption( "-session=" ); + aRestartOption.Append( SessionManagerClient::getSessionID() ); + pSmProps[ 2 ].vals[1].length = aRestartOption.Len()+1; + pSmProps[ 2 ].vals[1].value = strdup( aRestartOption.GetBuffer() ); + ByteString aRestartOptionNoLogo( "-nologo" ); + pSmProps[ 2 ].vals[2].length = aRestartOptionNoLogo.Len()+1; + pSmProps[ 2 ].vals[2].value = strdup( aRestartOptionNoLogo.GetBuffer() ); rtl::OUString aUserName; rtl::OString aUser; Index: source/services/autorecovery.cxx =================================================================== RCS file: /cvs/framework/framework/source/services/autorecovery.cxx,v retrieving revision 1.19.64.2 diff -u -r1.19.64.2 autorecovery.cxx --- openoffice.org.orig/framework/source/services/autorecovery.cxx 29 Jan 2007 13:48:43 -0000 1.19.64.2 +++ openoffice.org/framework/source/services/autorecovery.cxx 6 Mar 2007 15:26:04 -0000 @@ -2489,6 +2491,42 @@ AutoRecovery::st_impl_removeFile(sRemoveFile); } +class PseudoStatusIndicator : public css::lang::XTypeProvider + , public css::task::XStatusIndicator + , public ::cppu::OWeakObject +{ + public: + FWK_DECLARE_XINTERFACE + FWK_DECLARE_XTYPEPROVIDER + + virtual void SAL_CALL start(const ::rtl::OUString& sText , + sal_Int32 nRange) + throw(css::uno::RuntimeException) {} + + virtual void SAL_CALL end() + throw(css::uno::RuntimeException) {} + + virtual void SAL_CALL reset() + throw(css::uno::RuntimeException) {} + + virtual void SAL_CALL setText(const ::rtl::OUString& sText) + throw(css::uno::RuntimeException) {} + + virtual void SAL_CALL setValue(sal_Int32 nValue) + throw(css::uno::RuntimeException) {} +}; + +DEFINE_XINTERFACE_2(PseudoStatusIndicator , + OWeakObject , + DIRECT_INTERFACE(css::lang::XTypeProvider ), + DIRECT_INTERFACE(css::task::XStatusIndicator)) + +//*********************************************** +// XInterface +DEFINE_XTYPEPROVIDER_2(PseudoStatusIndicator , + css::lang::XTypeProvider , + css::task::XStatusIndicator) + //----------------------------------------------- AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aParams) { @@ -2537,7 +2575,18 @@ lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= ::rtl::OUString(); if (aParams.m_xProgress.is()) + { lDescriptor[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= aParams.m_xProgress; + } + else if ((eJob & AutoRecovery::E_SESSION_RESTORE) == AutoRecovery::E_SESSION_RESTORE) + { + //If we are restoring a session we want to leave it up to the window manager as to + //where to position the windows. If we allow the normal progress bar to be used + //then ToTop will be called, which will automatically reposition the window + //into the user's current workspace. + css::uno::Reference< css::task::XStatusIndicator > xNONE = new PseudoStatusIndicator; + lDescriptor[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xNONE; + } sal_Bool bBackupWasTried = ( ((rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_BACKUP ) == AutoRecovery::E_TRY_LOAD_BACKUP) || // temp. state! Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1090 retrieving revision 1.1091 diff -u -r1.1090 -r1.1091 --- openoffice.org.spec 5 Mar 2007 14:38:45 -0000 1.1090 +++ openoffice.org.spec 6 Mar 2007 15:42:19 -0000 1.1091 @@ -124,6 +124,7 @@ Patch67: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch Patch68: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch Patch69: openoffice.org-2.2.0.ooo63159.sal.dtype.patch +Patch70: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch %define instdir %{_libdir}/openoffice.org @@ -1040,6 +1041,7 @@ %patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch %patch68 -p1 -b .ooo68717.gstreamer.video.patch %patch69 -p1 -b .ooo63159.sal.dtype.patch +%patch70 -p1 -b .ooo75167.framework.workspacerestore.patch cp %{SOURCE1} extras/source/database/evolocal.odb @@ -2585,7 +2587,8 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Mon Mar 05 2007 Caolan McNamara - 1:2.2.0-10.2 +* Tue Mar 06 2007 Caolan McNamara - 1:2.2.0-10.2 +- rhbz#206268/ooo#75167 session restore back to the right workspace - -fno-threadsafe-statics seeing as we're already double locked http://people.redhat.com/caolanm/speed/threadsafe-statics.ods - drop openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch, atk fixed From fedora-cvs-commits at redhat.com Tue Mar 6 15:48:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 10:48:53 -0500 Subject: rpms/openoffice.org/FC-6 openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch, NONE, 1.1 workspace.sixtyfour11.patch, NONE, 1.1 .cvsignore, 1.117, 1.118 openoffice.org.spec, 1.931, 1.932 openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch, 1.4, NONE Message-ID: <200703061548.l26Fmre9021317@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21298 Modified Files: .cvsignore openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch workspace.sixtyfour11.patch Removed Files: openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch Log Message: rhbz#206268/ooo#75167 session restoration openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch: Source/vcl/unx/source/app/sm.cxx | 0 framework/source/services/autorecovery.cxx | 47 +++++++++++++++++++++++++++++ source/services/autorecovery.cxx | 0 vcl/unx/source/app/sm.cxx | 17 ++++++---- 4 files changed, 57 insertions(+), 7 deletions(-) --- NEW FILE openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch --- Index: Source/vcl/unx/source/app/sm.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/source/app/sm.cxx,v retrieving revision 1.29 diff -u -r1.29 sm.cxx --- openoffice.org.orig/vcl/unx/source/app/sm.cxx 6 Oct 2006 10:04:48 -0000 1.29 +++ openoffice.org/vcl/unx/source/app/sm.cxx 28 Feb 2007 14:16:07 -0000 @@ -239,14 +239,17 @@ pSmProps[ 2 ].name = const_cast(SmRestartCommand); pSmProps[ 2 ].type = const_cast(SmLISTofARRAY8); - pSmProps[ 2 ].num_vals = 2; - pSmProps[ 2 ].vals = new SmPropValue[2]; + pSmProps[ 2 ].num_vals = 3; + pSmProps[ 2 ].vals = new SmPropValue[3]; pSmProps[ 2 ].vals[0].length = aExec.Len()+1; - pSmProps[ 2 ].vals[0].value = strdup( aExec.GetBuffer() ); - ByteString aRestartOption( "-session=" ); - aRestartOption.Append( SessionManagerClient::getSessionID() ); - pSmProps[ 2 ].vals[1].length = aRestartOption.Len()+1; - pSmProps[ 2 ].vals[1].value = strdup( aRestartOption.GetBuffer() ); + pSmProps[ 2 ].vals[0].value = strdup( aExec.GetBuffer() ); + ByteString aRestartOption( "-session=" ); + aRestartOption.Append( SessionManagerClient::getSessionID() ); + pSmProps[ 2 ].vals[1].length = aRestartOption.Len()+1; + pSmProps[ 2 ].vals[1].value = strdup( aRestartOption.GetBuffer() ); + ByteString aRestartOptionNoLogo( "-nologo" ); + pSmProps[ 2 ].vals[2].length = aRestartOptionNoLogo.Len()+1; + pSmProps[ 2 ].vals[2].value = strdup( aRestartOptionNoLogo.GetBuffer() ); rtl::OUString aUserName; rtl::OString aUser; Index: source/services/autorecovery.cxx =================================================================== RCS file: /cvs/framework/framework/source/services/autorecovery.cxx,v retrieving revision 1.19.64.2 diff -u -r1.19.64.2 autorecovery.cxx --- openoffice.org.orig/framework/source/services/autorecovery.cxx 29 Jan 2007 13:48:43 -0000 1.19.64.2 +++ openoffice.org/framework/source/services/autorecovery.cxx 6 Mar 2007 15:26:04 -0000 @@ -2489,6 +2491,42 @@ AutoRecovery::st_impl_removeFile(sRemoveFile); } +class PseudoStatusIndicator : public css::lang::XTypeProvider + , public css::task::XStatusIndicator + , public ::cppu::OWeakObject +{ + public: + FWK_DECLARE_XINTERFACE + FWK_DECLARE_XTYPEPROVIDER + + virtual void SAL_CALL start(const ::rtl::OUString& sText , + sal_Int32 nRange) + throw(css::uno::RuntimeException) {} + + virtual void SAL_CALL end() + throw(css::uno::RuntimeException) {} + + virtual void SAL_CALL reset() + throw(css::uno::RuntimeException) {} + + virtual void SAL_CALL setText(const ::rtl::OUString& sText) + throw(css::uno::RuntimeException) {} + + virtual void SAL_CALL setValue(sal_Int32 nValue) + throw(css::uno::RuntimeException) {} +}; + +DEFINE_XINTERFACE_2(PseudoStatusIndicator , + OWeakObject , + DIRECT_INTERFACE(css::lang::XTypeProvider ), + DIRECT_INTERFACE(css::task::XStatusIndicator)) + +//*********************************************** +// XInterface +DEFINE_XTYPEPROVIDER_2(PseudoStatusIndicator , + css::lang::XTypeProvider , + css::task::XStatusIndicator) + //----------------------------------------------- AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aParams) { @@ -2537,7 +2575,18 @@ lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= ::rtl::OUString(); if (aParams.m_xProgress.is()) + { lDescriptor[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= aParams.m_xProgress; + } + else if ((eJob & AutoRecovery::E_SESSION_RESTORE) == AutoRecovery::E_SESSION_RESTORE) + { + //If we are restoring a session we want to leave it up to the window manager as to + //where to position the windows. If we allow the normal progress bar to be used + //then ToTop will be called, which will automatically reposition the window + //into the user's current workspace. + css::uno::Reference< css::task::XStatusIndicator > xNONE = new PseudoStatusIndicator; + lDescriptor[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xNONE; + } sal_Bool bBackupWasTried = ( ((rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_BACKUP ) == AutoRecovery::E_TRY_LOAD_BACKUP) || // temp. state! workspace.sixtyfour11.patch: basctl/inc/basidesh.hxx | 2 - basctl/source/basicide/basides1.cxx | 6 ++--- binfilter/bf_sc/source/core/tool/sc_rechead.cxx | 4 +-- binfilter/bf_sch/source/ui/view/sch_viewshe4.cxx | 10 ++++----- binfilter/bf_sfx2/source/control/sfx2_shell.cxx | 4 +-- binfilter/bf_svx/source/items/svx_flditem.cxx | 2 - binfilter/bf_sw/source/ui/inc/view.hxx | 2 - binfilter/inc/bf_sch/viewshel.hxx | 2 - binfilter/inc/bf_sfx2/shell.hxx | 2 - connectivity/source/inc/dbase/DTable.hxx | 2 - extensions/source/packer/packer2.hxx | 2 - sch/inc/viewshel.hxx | 2 - sch/source/ui/view/viewshe4.cxx | 8 +++---- sfx2/inc/objface.hxx | 12 +++++------ sfx2/inc/shell.hxx | 2 - sfx2/source/appl/workwin.cxx | 2 - sfx2/source/control/dispatch.cxx | 2 - sfx2/source/control/objface.cxx | 25 +++++++++++------------ sfx2/source/control/shell.cxx | 4 +-- sfx2/source/inc/workwin.hxx | 4 +-- svtools/source/items1/poolio.cxx | 2 - svtools/source/numbers/numhead.cxx | 4 +-- svx/source/items/flditem.cxx | 2 - sw/source/ui/inc/view.hxx | 2 - tools/inc/gen.hxx | 9 ++++---- 25 files changed, 59 insertions(+), 59 deletions(-) --- NEW FILE workspace.sixtyfour11.patch --- --- openoffice.org.orig/svtools/source/numbers/numhead.cxx 2006-09-17 17:20:40.000000000 +0200 +++ openoffice.org/svtools/source/numbers/numhead.cxx 2007-02-22 13:05:26.000000000 +0100 @@ -236,7 +236,7 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMu { nDataSize = nDataEnd - nDataPos; ULONG nPos = rStream.Tell(); - rStream.Seek(nDataPos-sizeof(ULONG)); + rStream.Seek(nDataPos-sizeof(sal_uInt32)); rStream << nDataSize; // Groesse am Anfang eintragen rStream.Seek(nPos); } --- openoffice.org.orig/extensions/source/packer/packer2.hxx 2006-03-16 14:00:21.000000000 +0100 +++ openoffice.org/extensions/source/packer/packer2.hxx 2007-02-22 19:04:50.000000000 +0100 @@ -93,7 +93,7 @@ class INetURLObject; \* ******************************************************************/ const sal_uInt32 PACK_ID = ((('S' << 8 | 'Z' ) << 8 | 'I' ) << 8 | 'P' ); -const USHORT HEADER_SIZE = 2*sizeof( ULONG ) + 3*sizeof( USHORT ); +const USHORT HEADER_SIZE = 2*sizeof( sal_uInt32 ) + 3*sizeof( USHORT ); class LocalFileHeader { --- openoffice.org.orig/svx/source/items/flditem.cxx 2006-10-12 14:53:54.000000000 +0200 +++ openoffice.org/svx/source/items/flditem.cxx 2007-02-22 19:06:03.000000000 +0100 @@ -402,7 +402,7 @@ void SvxURLField::Load( SvPersistStream { USHORT nFormat; sal_uInt32 nFrameMarker, nCharSetMarker; - long nUlongSize = (long)sizeof(ULONG); + long nUlongSize = (long)sizeof(sal_uInt32); String aTmpURL; rStm >> nFormat; --- openoffice.org.orig/svtools/source/items1/poolio.cxx 2006-10-12 17:22:39.000000000 +0200 +++ openoffice.org/svtools/source/items1/poolio.cxx 2007-02-22 19:09:40.000000000 +0100 @@ -788,7 +788,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStre if ( pImp->nMajorVer > 1 || pImp->nMinorVer >= 3 ) { // Version-Map finden (letztes ULONG der Size-Table gibt Pos an) - rStream.Seek( nEndOfSizes - sizeof(ULONG) ); + rStream.Seek( nEndOfSizes - sizeof(sal_uInt32) ); sal_uInt32 nVersionMapPos; rStream >> nVersionMapPos; rStream.Seek( nVersionMapPos ); --- openoffice.org.orig/svtools/source/numbers/numhead.cxx 2007-02-22 13:59:11.000000000 +0100 +++ openoffice.org/svtools/source/numbers/numhead.cxx 2007-02-22 19:09:23.000000000 +0100 @@ -106,7 +106,7 @@ SvNumWriteHeader::~SvNumWriteHeader() if ( nPos - nDataPos != nDataSize ) // Default getroffen? { nDataSize = nPos - nDataPos; - rStream.Seek(nDataPos - sizeof(ULONG)); + rStream.Seek(nDataPos - sizeof(sal_uInt32)); rStream << nDataSize; // Groesse am Anfang eintragen rStream.Seek(nPos); } --- openoffice.org.orig/binfilter/bf_sc/source/core/tool/sc_rechead.cxx 2006-10-27 16:37:48.000000000 +0200 +++ openoffice.org/binfilter/bf_sc/source/core/tool/sc_rechead.cxx 2007-02-22 19:07:47.000000000 +0100 @@ -98,7 +98,7 @@ namespace binfilter { /*N*/ if ( nPos - nDataPos != nDataSize ) // Default getroffen? /*N*/ { /*N*/ nDataSize = nPos - nDataPos; -/*N*/ rStream.Seek(nDataPos - sizeof(ULONG)); +/*N*/ rStream.Seek(nDataPos - sizeof(sal_uInt32)); /*N*/ rStream << nDataSize; // Groesse am Anfang eintragen /*N*/ rStream.Seek(nPos); /*N*/ } @@ -214,7 +214,7 @@ namespace binfilter { /*N*/ { /*N*/ nDataSize = nDataEnd - nDataPos; /*N*/ ULONG nPos = rStream.Tell(); -/*N*/ rStream.Seek(nDataPos-sizeof(ULONG)); +/*N*/ rStream.Seek(nDataPos-sizeof(sal_uInt32)); /*N*/ rStream << nDataSize; // Groesse am Anfang eintragen /*N*/ rStream.Seek(nPos); /*N*/ } --- openoffice.org.orig/binfilter/bf_svx/source/items/svx_flditem.cxx 2006-10-27 23:15:22.000000000 +0200 +++ openoffice.org/binfilter/bf_svx/source/items/svx_flditem.cxx 2007-02-22 19:06:25.000000000 +0100 @@ -403,7 +403,7 @@ namespace binfilter { /*N*/ { /*N*/ USHORT nFormat; /*N*/ sal_uInt32 nFrameMarker, nCharSetMarker; -/*N*/ long nUlongSize = (long)sizeof(ULONG); +/*N*/ long nUlongSize = (long)sizeof(sal_uInt32); /*N*/ String aTmpURL; /*N*/ /*N*/ rStm >> nFormat; --- openoffice.org.orig/connectivity/source/inc/dbase/DTable.hxx 2007-02-23 15:02:12.000000000 +0100 +++ openoffice.org/connectivity/source/inc/dbase/DTable.hxx 2007-02-23 15:02:38.000000000 +0100 @@ -92,7 +92,7 @@ namespace connectivity struct DBFColumn { /* Feldbezeichner */ BYTE db_fnm[11]; /* Feldname */ BYTE db_typ; /* Feldtyp */ - ULONG db_adr; /* Feldadresse */ + UINT32 db_adr; /* Feldadresse */ BYTE db_flng; /* Feldlaenge */ BYTE db_dez; /* Dezimalstellen fuer N */ BYTE db_frei2[14]; /* reserviert */ --- openoffice.org.orig/basctl/inc/basidesh.hxx 2007-01-24 18:24:39.000000000 +0100 +++ openoffice.org/basctl/inc/basidesh.hxx 2007-02-19 18:12:19.000000000 +0100 @@ -200,7 +200,7 @@ public: void ExecuteBasic( SfxRequest& rReq ); void ExecuteDialog( SfxRequest& rReq ); - virtual BOOL HasUIFeature( ULONG nFeature ); + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); long CallBasicErrorHdl( StarBASIC* pBasic ); long CallBasicBreakHdl( StarBASIC* pBasic ); --- openoffice.org.orig/basctl/source/basicide/basides1.cxx 2007-01-02 16:49:14.000000000 +0100 +++ openoffice.org/basctl/source/basicide/basides1.cxx 2007-02-19 18:12:44.000000000 +0100 @@ -1113,15 +1113,15 @@ void __EXPORT BasicIDEShell::GetState(Sf pCurWin->GetState( rSet ); } -BOOL BasicIDEShell::HasUIFeature( ULONG nFeature ) +sal_Bool BasicIDEShell::HasUIFeature( sal_uInt32 nFeature ) { - BOOL bResult = FALSE; + sal_Bool bResult = sal_False; if ( (nFeature & BASICIDE_UI_FEATURE_SHOW_BROWSER) == BASICIDE_UI_FEATURE_SHOW_BROWSER ) { // fade out (in) property browser in module (dialog) windows if ( pCurWin && pCurWin->IsA( TYPE( DialogWindow ) ) && !pCurWin->IsReadOnly() ) - bResult = TRUE; + bResult = sal_True; } return bResult; --- openoffice.org.orig/binfilter/bf_sfx2/source/control/sfx2_shell.cxx 2006-10-27 21:10:22.000000000 +0200 +++ openoffice.org/binfilter/bf_sfx2/source/control/sfx2_shell.cxx 2007-02-19 18:26:16.000000000 +0100 @@ -1383,9 +1383,9 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ( /*N*/ return SFX_APP()->GetSlotPool( GetFrame() ); /*N*/ } -/*N*/ BOOL SfxShell::HasUIFeature( ULONG ) +/*N*/ sal_Bool SfxShell::HasUIFeature( sal_uInt32 ) /*N*/ { -/*N*/ return FALSE; +/*N*/ return sal_False; /*N*/ } /*N*/ long DispatcherUpdate_Impl( void* pObj, void* pArg ) --- openoffice.org.orig/binfilter/bf_sch/source/ui/view/sch_viewshe4.cxx 2006-10-27 20:00:56.000000000 +0200 +++ openoffice.org/binfilter/bf_sch/source/ui/view/sch_viewshe4.cxx 2007-02-19 18:27:49.000000000 +0100 @@ -442,28 +442,28 @@ namespace binfilter { -/** Returns TRUE if the corresponding feature is available, +/** Returns sal_True if the corresponding feature is available, eg it returns only true if the chart is three dimensional and the 3d effect flyer is to be displayed */ -/*N*/ BOOL SchViewShell::HasUIFeature( ULONG nFeature ) +/*N*/ sal_Bool SchViewShell::HasUIFeature( sal_uInt32 nFeature ) /*N*/ { /*N*/ switch( nFeature ) /*N*/ { /*N*/ case SCH_UI_FEATURE_THREE_D: /*N*/ if( pDocSh ) /*N*/ return pDocSh->GetDoc().IsReal3D(); -/*?*/ return FALSE; +/*?*/ return sal_False; /*N*/ /*N*/ case SCH_UI_FEATURE_OWN_DATA: /*N*/ // ToDo: If chart is inside Calc/Writer using external data, FALSE /*N*/ // should be returned. It currently works in a different way (hack) -/*N*/ return TRUE; +/*N*/ return sal_True; /*N*/ /*?*/ default: /*?*/ DBG_ERRORFILE( "Unknown UI Feature requested!" ); -/*?*/ return FALSE; /*N*/ } +/*?*/ return sal_False; /*N*/ } --- openoffice.org.orig/binfilter/bf_sw/source/ui/inc/view.hxx 2006-10-28 03:00:02.000000000 +0200 +++ openoffice.org/binfilter/bf_sw/source/ui/inc/view.hxx 2007-02-19 18:31:21.000000000 +0100 @@ -365,7 +365,7 @@ public: SfxDispatcher &GetDispatcher(); - virtual BOOL HasUIFeature( sal_uInt32 nFeature ); + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); virtual void ShowCursor( FASTBOOL bOn = TRUE ); ShellModes GetShellMode(); --- openoffice.org.orig/binfilter/inc/bf_sfx2/shell.hxx 2006-10-28 05:09:03.000000000 +0200 +++ openoffice.org/binfilter/inc/bf_sfx2/shell.hxx 2007-02-19 18:23:50.000000000 +0100 @@ -235,7 +235,7 @@ public: SfxDispatcher* GetDispatcher() const; SfxViewFrame* GetFrame() const; ResMgr* GetResMgr() const; - virtual BOOL HasUIFeature( ULONG nFeature ); + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); void UIFeatureChanged(); // Items --- openoffice.org.orig/binfilter/inc/bf_sch/viewshel.hxx 2006-10-28 04:50:58.000000000 +0200 +++ openoffice.org/binfilter/inc/bf_sch/viewshel.hxx 2007-02-19 18:23:41.000000000 +0100 @@ -174,7 +174,7 @@ public: // drag and drop - virtual BOOL HasUIFeature( ULONG nFeature ); + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); --- openoffice.org.orig/sfx2/inc/objface.hxx 2006-10-12 17:44:51.000000000 +0200 +++ openoffice.org/sfx2/inc/objface.hxx 2007-02-19 17:48:55.000000000 +0100 @@ -107,19 +107,19 @@ public: const SfxInterface* GetRealInterfaceForSlot( const SfxSlot* ) const; void RegisterObjectBar( USHORT, const ResId&, const String* pST=0 ); - void RegisterObjectBar( USHORT, const ResId&, ULONG nFeature, const String* pST=0 ); + void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); void RegisterChildWindow( USHORT, BOOL bContext, const String* pST=0 ); - void RegisterChildWindow( USHORT, BOOL bContext, ULONG nFeature, const String* pST=0 ); + void RegisterChildWindow( USHORT, BOOL bContext, sal_uInt32 nFeature, const String* pST=0 ); void RegisterStatusBar( const ResId& ); const ResId& GetObjectBarResId( USHORT nNo ) const; USHORT GetObjectBarPos( USHORT nNo ) const; - ULONG GetObjectBarFeature( USHORT nNo ) const; + sal_uInt32 GetObjectBarFeature( USHORT nNo ) const; USHORT GetObjectBarCount() const; void SetObjectBarPos( USHORT nPos, USHORT nId ); const String* GetObjectBarName( USHORT nNo ) const; BOOL IsObjectBarVisible( USHORT nNo) const; - ULONG GetChildWindowFeature( USHORT nNo ) const; - ULONG GetChildWindowId( USHORT nNo ) const; + sal_uInt32 GetChildWindowFeature( USHORT nNo ) const; + sal_uInt32 GetChildWindowId( USHORT nNo ) const; USHORT GetChildWindowCount() const; void RegisterPopupMenu( const ResId& ); const ResId& GetPopupMenuResId() const; @@ -164,7 +164,7 @@ public: SfxIFConfig_Impl(); ~SfxIFConfig_Impl(); BOOL Store(SvStream&); - void RegisterObjectBar( USHORT, const ResId&, ULONG nFeature, const String* pST=0 ); + void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); USHORT GetType(); }; #endif --- openoffice.org.orig/sfx2/inc/shell.hxx 2006-06-20 00:04:31.000000000 +0200 +++ openoffice.org/sfx2/inc/shell.hxx 2007-02-19 18:34:07.000000000 +0100 @@ -255,7 +255,7 @@ public: SfxDispatcher* GetDispatcher() const; SfxViewFrame* GetFrame() const; ResMgr* GetResMgr() const; - virtual BOOL HasUIFeature( ULONG nFeature ); + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); void UIFeatureChanged(); // Items --- openoffice.org.orig/sfx2/source/appl/workwin.cxx 2007-02-16 15:29:45.000000000 +0100 +++ openoffice.org/sfx2/source/appl/workwin.cxx 2007-02-19 12:23:40.000000000 +0100 @@ -2142,7 +2142,7 @@ void SfxWorkWindow::ConfigChild_Impl(Sfx //-------------------------------------------------------------------- -void SfxWorkWindow::SetChildWindowVisible_Impl( ULONG lId, BOOL bEnabled, USHORT nMode ) +void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, USHORT nMode ) { USHORT nInter = (USHORT) ( lId >> 16 ); USHORT nId = (USHORT) ( lId & 0xFFFF ); --- openoffice.org.orig/sfx2/source/control/dispatch.cxx 2006-11-01 19:26:15.000000000 +0100 +++ openoffice.org/sfx2/source/control/dispatch.cxx 2007-02-19 17:12:02.000000000 +0100 @@ -1829,7 +1829,7 @@ long SfxDispatcher::Update_Impl( sal_Boo sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin ) { - sal_uInt32 nHelpId = 0L; + sal_uInt32 nHelpId = 0; SFX_APP(); SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame()->GetWorkWindow_Impl(); sal_Bool bIsActive = sal_False; --- openoffice.org.orig/sfx2/source/control/objface.cxx 2006-10-12 17:51:28.000000000 +0200 +++ openoffice.org/sfx2/source/control/objface.cxx 2007-02-19 17:51:36.000000000 +0100 @@ -88,9 +88,9 @@ struct SfxObjectUI_Impl BOOL bVisible; BOOL bContext; String* pName; - ULONG nFeature; + sal_uInt32 nFeature; - SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, ULONG nFeat) : + SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, sal_uInt32 nFeat) : nPos(n), aResId(rResId.GetId(), rResId.GetResMgr()), bVisible(bVis), @@ -140,7 +140,7 @@ struct SfxInterface_Impl } }; -static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr ); +static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr ); //==================================================================== @@ -432,14 +432,14 @@ void SfxInterface::RegisterObjectBar( US } -void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr ) +void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr ) { SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr ); if ( pUI ) pImpData->pObjectBars->Append(pUI); } -SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr ) +SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr ) { if ((nPos & SFX_VISIBILITY_MASK) == 0) nPos |= SFX_VISIBILITY_STANDARD; @@ -524,7 +524,7 @@ void SfxInterface::RegisterChildWindow(U RegisterChildWindow( nId, bContext, 0UL, pChildWinName ); } -void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, ULONG nFeature, const String*) +void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, sal_uInt32 nFeature, const String*) { SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, TRUE, nFeature); pUI->bContext = bContext; @@ -537,7 +537,7 @@ void SfxInterface::RegisterStatusBar(con } -ULONG SfxInterface::GetChildWindowId (USHORT nNo) const +sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const { if ( pGenoType ) { @@ -554,13 +554,13 @@ ULONG SfxInterface::GetChildWindowId (US USHORT nCWCount = pImpData->pChildWindows->Count(); DBG_ASSERT( nNopChildWindows)[nNo]->aResId.GetId(); + sal_uInt32 nRet = (*pImpData->pChildWindows)[nNo]->aResId.GetId(); if ( (*pImpData->pChildWindows)[nNo]->bContext ) - nRet += ( (ULONG) nClassId ) << 16; + nRet += sal_uInt32( nClassId ) << 16; return nRet; } -ULONG SfxInterface::GetChildWindowFeature (USHORT nNo) const +sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const { if ( pGenoType ) { @@ -577,8 +577,7 @@ ULONG SfxInterface::GetChildWindowFeatur USHORT nCWCount = pImpData->pChildWindows->Count(); DBG_ASSERT( nNopChildWindows)[nNo]->nFeature; - return nRet; + return (*pImpData->pChildWindows)[nNo]->nFeature; } //-------------------------------------------------------------------- @@ -630,7 +629,7 @@ const String* SfxInterface::GetObjectBar return (*pImpData->pObjectBars)[nNo]->pName; } -ULONG SfxInterface::GetObjectBarFeature ( USHORT nNo ) const +sal_uInt32 SfxInterface::GetObjectBarFeature ( USHORT nNo ) const { BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName()); if ( bGenoType ) --- openoffice.org.orig/sfx2/source/control/shell.cxx 2006-10-12 17:51:54.000000000 +0200 +++ openoffice.org/sfx2/source/control/shell.cxx 2007-02-19 18:14:36.000000000 +0100 @@ -1293,9 +1294,9 @@ SfxObjectShell* SfxShell::GetObjectShell //-------------------------------------------------------------------- -BOOL SfxShell::HasUIFeature( ULONG ) +sal_Bool SfxShell::HasUIFeature( sal_uInt32 ) { - return FALSE; + return sal_False; } long DispatcherUpdate_Impl( void*, void* pArg ) --- openoffice.org.orig/sfx2/source/inc/workwin.hxx 2007-02-16 15:29:39.000000000 +0100 +++ openoffice.org/sfx2/source/inc/workwin.hxx 2007-02-16 15:30:39.000000000 +0100 @@ -171,7 +171,7 @@ struct SfxChildWin_Impl BOOL bEnable; BOOL bDisabled; - SfxChildWin_Impl( ULONG nID ) : + SfxChildWin_Impl( sal_uInt32 nID ) : nSaveId((USHORT) (nID & 0xFFFF) ), nInterfaceId((USHORT) (nID >> 16)), nId(nSaveId), @@ -375,7 +375,7 @@ public: // Methoden f"ur ChildWindows void UpdateChildWindows_Impl(); void ResetChildWindows_Impl(); - void SetChildWindowVisible_Impl( ULONG, BOOL, USHORT ); + void SetChildWindowVisible_Impl( sal_uInt32, BOOL, USHORT ); void ToggleChildWindow_Impl(USHORT,BOOL); BOOL HasChildWindow_Impl(USHORT); BOOL KnowsChildWindow_Impl(USHORT); --- openoffice.org.orig/sch/inc/viewshel.hxx 2007-01-24 18:14:14.000000000 +0100 +++ openoffice.org/sch/inc/viewshel.hxx 2007-02-19 18:22:46.000000000 +0100 @@ -199,7 +199,7 @@ public: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, SchWindow* pWin ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, SchWindow* pWin ); - virtual BOOL HasUIFeature( ULONG nFeature ); + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); --- openoffice.org.orig/sch/source/ui/view/viewshe4.cxx 2007-01-24 18:14:41.000000000 +0100 +++ openoffice.org/sch/source/ui/view/viewshe4.cxx 2007-02-19 18:23:17.000000000 +0100 @@ -673,24 +673,24 @@ USHORT SchViewShell::PrepareClose(BOOL b eg it returns only true if the chart is three dimensional and the 3d effect flyer is to be displayed */ -BOOL SchViewShell::HasUIFeature( ULONG nFeature ) +sal_Bool SchViewShell::HasUIFeature( sal_uInt32 nFeature ) { switch( nFeature ) { case SCH_UI_FEATURE_THREE_D: if( pDocSh ) return pDocSh->GetDoc().IsReal3D(); - return FALSE; + return sal_False; case SCH_UI_FEATURE_OWN_DATA: // ToDo: If chart is inside Calc/Writer using external data, FALSE // should be returned. It currently works in a different way (hack) - return TRUE; + return sal_True; default: DBG_ERRORFILE( "Unknown UI Feature requested!" ); - return FALSE; } + return sal_False; } void SchViewShell::AllowSelectionChangeBroadcasts( sal_Bool bAllow ) --- openoffice.org.orig/sw/source/ui/inc/view.hxx 2007-01-24 18:20:23.000000000 +0100 +++ openoffice.org/sw/source/ui/inc/view.hxx 2007-02-19 18:35:01.000000000 +0100 @@ -435,7 +435,7 @@ public: void GotFocus() const; virtual SdrView* GetDrawView() const; - virtual BOOL HasUIFeature( sal_uInt32 nFeature ); + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); virtual void ShowCursor( FASTBOOL bOn = TRUE ); virtual ErrCode DoVerb( long nVerb ); --- openoffice.org/tools/inc/gen.hxx 2005-09-09 15:41:09.000000000 +0200 +++ openoffice.org.orig/tools/inc/gen.hxx 2007-02-26 17:08:21.000000000 +0100 @@ -254,8 +254,9 @@ inline Size::Size( long nWidth, long nHe // - Range - // --------- -#define RANGE_MIN ((long)0x80000000L) -#define RANGE_MAX 0x7FFFFFFFL +#include +#define RANGE_MIN LONG_MIN +#define RANGE_MAX LONG_MAX class Range : public Pair { @@ -302,8 +302,8 @@ inline void Range::Justify() // - Selection - // ------------- -#define SELECTION_MIN ((long)0x80000000L) -#define SELECTION_MAX 0x7FFFFFFFL +#define SELECTION_MIN LONG_MIN +#define SELECTION_MAX LONG_MAX class Selection : public Pair { Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/.cvsignore,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- .cvsignore 15 Sep 2006 09:16:15 -0000 1.117 +++ .cvsignore 6 Mar 2007 15:48:46 -0000 1.118 @@ -184,3 +184,4 @@ OOD680_m2.tar.bz2 OOD680_m3.tar.bz2 OOD680_m4.tar.bz2 +OOD680_m5.tar.bz2 Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v retrieving revision 1.931 retrieving revision 1.932 diff -u -r1.931 -r1.932 --- openoffice.org.spec 23 Feb 2007 09:03:28 -0000 1.931 +++ openoffice.org.spec 6 Mar 2007 15:48:46 -0000 1.932 @@ -1,6 +1,6 @@ %define oootag OOD680 %define ooomilestone 5 -%define rh_rpm_release 5.14 +%define rh_rpm_release 5.15 # gcc#19664# %define stlvisibilityfcked 1 @@ -160,7 +160,8 @@ Patch92: workspace.fwk55.patch Patch93: openoffice.org-2.2.0.rh228002.escape.shell.patch Patch94: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch -Patch95: openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch +Patch95: workspace.sixtyfour11.patch +Patch96: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -1055,7 +1056,8 @@ %patch92 -p1 -b .workspace.fwk55.patch %patch93 -p1 -b .rh228002.escape.shell.patch %patch94 -p1 -b .ooo74451.sw.typemismatch.patch -%patch95 -p1 -b .ooo74771.svtools.binfilter.patch +%patch95 -p1 -b .workspace.sixtyfour11.patch +%patch96 -p1 -b .ooo75167.framework.workspacerestore.patch tar xzf %{SOURCE1} @@ -2581,8 +2583,11 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Thu Mar 06 2007 Caolan McNamara - 1:2.0.4-5.5.15 +- rhbz#206268/ooo#75167 session restore back to correct workspace + * Thu Feb 22 2007 Caolan McNamara - 1:2.0.4-5.5.14 -- add openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch +- add workspace.sixtyfour11.patch * Fri Feb 09 2007 Caolan McNamara - 1:2.0.4-5.5.11 - Resolves: rhbz#222426 add openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch --- openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 6 16:08:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 11:08:10 -0500 Subject: rpms/libXdamage/devel .cvsignore, 1.7, 1.8 libXdamage.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200703061608.l26G8ArB015172@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libXdamage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15146/devel Modified Files: .cvsignore libXdamage.spec sources Log Message: auto-import libXdamage-1.1-1.fc7 on branch devel from libXdamage-1.1-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libXdamage/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Nov 2006 15:45:12 -0000 1.7 +++ .cvsignore 6 Mar 2007 16:08:08 -0000 1.8 @@ -1 +1 @@ -libXdamage-1.0.4.tar.bz2 +libXdamage-1.1.tar.bz2 Index: libXdamage.spec =================================================================== RCS file: /cvs/dist/rpms/libXdamage/devel/libXdamage.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libXdamage.spec 20 Nov 2006 15:45:12 -0000 1.15 +++ libXdamage.spec 6 Mar 2007 16:08:08 -0000 1.16 @@ -1,8 +1,8 @@ Summary: X.Org X11 libXdamage runtime library Name: libXdamage -Version: 1.0.4 -Release: 1 -License: MIT/X11 +Version: 1.1 +Release: 1%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -11,8 +11,8 @@ BuildRequires: pkgconfig BuildRequires: libX11-devel -# NOTE: Needs damageproto >= 1.0 -BuildRequires: xorg-x11-proto-devel >= 7.0-1 +# damageproto 1.1. should probably turn those into virtual provides... +BuildRequires: xorg-x11-proto-devel >= 7.2-3 BuildRequires: libXfixes-devel Obsoletes: XFree86-libs, xorg-x11-libs @@ -27,7 +27,7 @@ Requires: %{name} = %{version}-%{release} # xdamage.pc Requires: xproto damageproto >= 1.0 xfixes -Requires: xorg-x11-proto-devel >= 7.0-1 +Requires: xorg-x11-proto-devel >= 7.2-3 Requires: libXfixes-devel Obsoletes: XFree86-devel, xorg-x11-devel @@ -38,14 +38,8 @@ %prep %setup -q -# Disable static library creation by default. -%define with_static 0 - %build -%configure \ -%if ! %{with_static} - --disable-static -%endif +%configure --disable-static make %install @@ -62,7 +56,7 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%%files +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README INSTALL ChangeLog %{_libdir}/libXdamage.so.1 @@ -73,13 +67,13 @@ %dir %{_includedir}/X11 %dir %{_includedir}/X11/extensions %{_includedir}/X11/extensions/Xdamage.h -%if %{with_static} -%{_libdir}/libXdamage.a -%endif %{_libdir}/libXdamage.so %{_libdir}/pkgconfig/xdamage.pc %changelog +* Mon Mar 05 2007 Adam Jackson 1.1-1 +- libXdamage 1.1 + * Mon Nov 20 2006 Adam Jackson 1.0.4-1 - Update to 1.0.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libXdamage/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2006 15:45:12 -0000 1.9 +++ sources 6 Mar 2007 16:08:08 -0000 1.10 @@ -1 +1 @@ -4d0eece7a8372a7754db1de08c2be324 libXdamage-1.0.4.tar.bz2 +8aeb25ee35f5538a338462a712e7f9d4 libXdamage-1.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 6 16:19:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 11:19:22 -0500 Subject: rpms/openoffice.org/FC-6 workspace.sixtyfour11.patch,1.1,1.2 Message-ID: <200703061619.l26GJMIQ008471@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8455 Modified Files: workspace.sixtyfour11.patch Log Message: adjust patch workspace.sixtyfour11.patch: basctl/inc/basidesh.hxx | 2 - basctl/source/basicide/basides1.cxx | 6 ++--- binfilter/bf_sc/source/core/tool/sc_rechead.cxx | 4 +-- binfilter/bf_sch/source/ui/view/sch_viewshe4.cxx | 10 ++++----- binfilter/bf_sfx2/source/control/sfx2_shell.cxx | 4 +-- binfilter/bf_svx/source/items/svx_flditem.cxx | 2 - binfilter/bf_sw/source/ui/inc/view.hxx | 2 - binfilter/inc/bf_sch/viewshel.hxx | 2 - binfilter/inc/bf_sfx2/shell.hxx | 2 - connectivity/source/inc/dbase/DTable.hxx | 2 - extensions/source/packer/packer2.hxx | 2 - sch/inc/viewshel.hxx | 2 - sch/source/ui/view/viewshe4.cxx | 8 +++---- sfx2/inc/objface.hxx | 12 +++++------ sfx2/inc/shell.hxx | 2 - sfx2/source/appl/workwin.cxx | 2 - sfx2/source/control/dispatch.cxx | 2 - sfx2/source/control/objface.cxx | 25 +++++++++++------------ sfx2/source/control/shell.cxx | 4 +-- sfx2/source/inc/workwin.hxx | 4 +-- svtools/source/items1/poolio.cxx | 2 - svtools/source/numbers/numhead.cxx | 4 +-- svx/source/items/flditem.cxx | 2 - sw/source/ui/inc/view.hxx | 2 - tools/inc/gen.hxx | 9 ++++---- 25 files changed, 59 insertions(+), 59 deletions(-) Index: workspace.sixtyfour11.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/workspace.sixtyfour11.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workspace.sixtyfour11.patch 6 Mar 2007 15:48:46 -0000 1.1 +++ workspace.sixtyfour11.patch 6 Mar 2007 16:19:20 -0000 1.2 @@ -179,15 +179,15 @@ --- openoffice.org.orig/binfilter/bf_sw/source/ui/inc/view.hxx 2006-10-28 03:00:02.000000000 +0200 +++ openoffice.org/binfilter/bf_sw/source/ui/inc/view.hxx 2007-02-19 18:31:21.000000000 +0100 -@@ -365,7 +365,7 @@ public: - +@@ -408,7 +408,7 @@ SfxDispatcher &GetDispatcher(); + //STRIP001 virtual SdrView* GetDrawView() const; - virtual BOOL HasUIFeature( sal_uInt32 nFeature ); -+ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); ++ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); virtual void ShowCursor( FASTBOOL bOn = TRUE ); + //STRIP001 virtual ErrCode DoVerb( long nVerb ); - ShellModes GetShellMode(); --- openoffice.org.orig/binfilter/inc/bf_sfx2/shell.hxx 2006-10-28 05:09:03.000000000 +0200 +++ openoffice.org/binfilter/inc/bf_sfx2/shell.hxx 2007-02-19 18:23:50.000000000 +0100 @@ -235,7 +235,7 @@ public: @@ -281,54 +281,54 @@ sal_Bool bIsActive = sal_False; --- openoffice.org.orig/sfx2/source/control/objface.cxx 2006-10-12 17:51:28.000000000 +0200 +++ openoffice.org/sfx2/source/control/objface.cxx 2007-02-19 17:51:36.000000000 +0100 -@@ -88,9 +88,9 @@ struct SfxObjectUI_Impl +@@ -87,9 +87,9 @@ BOOL bVisible; BOOL bContext; String* pName; - ULONG nFeature; -+ sal_uInt32 nFeature; ++ sal_uInt32 nFeature; -- SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, ULONG nFeat) : -+ SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, sal_uInt32 nFeat) : +- SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, ULONG nFeat, ++ SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, sal_uInt32 nFeat, + USHORT nClassId=0xFFFF) : nPos(n), - aResId(rResId.GetId(), rResId.GetResMgr()), - bVisible(bVis), -@@ -140,7 +140,7 @@ struct SfxInterface_Impl + nInterfaceId(nClassId), +@@ -141,7 +141,7 @@ } }; --static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr ); -+static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr ); +-static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr, USHORT nInterface ); ++static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr, USHORT nInterface ); //==================================================================== -@@ -432,14 +432,14 @@ void SfxInterface::RegisterObjectBar( US +@@ -433,14 +433,14 @@ } -void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr ) +void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr ) { - SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr ); + SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr, nClassId ); if ( pUI ) pImpData->pObjectBars->Append(pUI); } --SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr ) -+SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr ) +-SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr, USHORT nClassId ) ++SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr, USHORT nClassId ) { if ((nPos & SFX_VISIBILITY_MASK) == 0) nPos |= SFX_VISIBILITY_STANDARD; -@@ -524,7 +524,7 @@ void SfxInterface::RegisterChildWindow(U +@@ -525,7 +525,7 @@ RegisterChildWindow( nId, bContext, 0UL, pChildWinName ); } -void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, ULONG nFeature, const String*) +void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, sal_uInt32 nFeature, const String*) { - SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, TRUE, nFeature); + SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, TRUE, nFeature, 0); pUI->bContext = bContext; -@@ -537,7 +537,7 @@ void SfxInterface::RegisterStatusBar(con +@@ -538,7 +538,7 @@ } @@ -337,7 +337,7 @@ { if ( pGenoType ) { -@@ -554,13 +554,13 @@ ULONG SfxInterface::GetChildWindowId (US +@@ -555,13 +555,13 @@ USHORT nCWCount = pImpData->pChildWindows->Count(); DBG_ASSERT( nNopChildWindows->Count(); DBG_ASSERT( nNopObjectBars)[nNo]->pName; } From fedora-cvs-commits at redhat.com Tue Mar 6 16:29:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 11:29:26 -0500 Subject: rpms/diffstat/devel COPYING, NONE, 1.1 .cvsignore, 1.7, 1.8 diffstat.spec, 1.20, 1.21 sources, 1.7, 1.8 Message-ID: <200703061629.l26GTQcD008772@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/diffstat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8756 Modified Files: .cvsignore diffstat.spec sources Added Files: COPYING Log Message: * Tue Mar 6 2007 Tim Waugh 1.43-3 - Fixed source0 (bug #225695). - Added COPYING file, taken from diffstat.c. - Resolves: rhbz#225695 --- NEW FILE COPYING --- /****************************************************************************** * Copyright 1994-2005,2006 by Thomas E. Dickey * * All Rights Reserved. * * * * Permission to use, copy, modify, and distribute this software and its * * documentation for any purpose and without fee is hereby granted, provided * * that the above copyright notice appear in all copies and that both that * * copyright notice and this permission notice appear in supporting * * documentation, and that the name of the above listed copyright holder(s) * * not be used in advertising or publicity pertaining to distribution of the * * software without specific, written prior permission. * * * * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD * * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND * * FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE * * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR * * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ******************************************************************************/ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/diffstat/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Jan 2007 14:12:23 -0000 1.7 +++ .cvsignore 6 Mar 2007 16:29:24 -0000 1.8 @@ -2,3 +2,4 @@ diffstat-1.38.tgz diffstat-1.41.tgz diffstat-1.43.tar.gz +diffstat-1.43.tgz Index: diffstat.spec =================================================================== RCS file: /cvs/dist/rpms/diffstat/devel/diffstat.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- diffstat.spec 6 Mar 2007 11:21:05 -0000 1.20 +++ diffstat.spec 6 Mar 2007 16:29:24 -0000 1.21 @@ -1,12 +1,13 @@ Summary: A utility which provides statistics based on the output of diff Name: diffstat Version: 1.43 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: distributable URL: http://invisible-island.net/diffstat # Note that the upstream tarball is unversioned, just %{name}.tar.gz -Source: ftp://invisible-island.net/diffstat/%{name}-%{version}.tar.gz +Source0: ftp://invisible-island.net/diffstat/%{name}-%{version}.tgz +Source1: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -28,16 +29,22 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +cp %{SOURCE1} . %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) +%doc COPYING %{_bindir}/diffstat %{_mandir}/*/* %changelog +* Tue Mar 6 2007 Tim Waugh 1.43-3 +- Fixed source0 (bug #225695). +- Added COPYING file, taken from diffstat.c. + * Tue Mar 6 2007 Tim Waugh 1.43-2 - Fixed buildroot (bug #225695). - Build should not require gzip or bzip2 as these are exceptions (bug #225695). Index: sources =================================================================== RCS file: /cvs/dist/rpms/diffstat/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Jan 2007 14:12:23 -0000 1.7 +++ sources 6 Mar 2007 16:29:24 -0000 1.8 @@ -1 +1 @@ -c23f9af8075fd81e98a0afdc3df49de9 diffstat-1.43.tar.gz +c23f9af8075fd81e98a0afdc3df49de9 diffstat-1.43.tgz From fedora-cvs-commits at redhat.com Tue Mar 6 16:44:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 11:44:29 -0500 Subject: rpms/gnome-panel/devel gnome-panel-xdg-user-dirs.patch, NONE, 1.1 gnome-panel.spec, 1.182, 1.183 Message-ID: <200703061644.l26GiTRR031731@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31645 Modified Files: gnome-panel.spec Added Files: gnome-panel-xdg-user-dirs.patch Log Message: * Tue Mar 6 2007 Alexander Larsson - 2.17.92-1 - Add xdg-user-dirs patch gnome-panel-xdg-user-dirs.patch: menu.c | 87 +++++++++++++++++++++++++++++++++++++++++ panel-menu-items.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 186 insertions(+), 11 deletions(-) --- NEW FILE gnome-panel-xdg-user-dirs.patch --- Index: gnome-panel/menu.c =================================================================== --- gnome-panel/menu.c (revision 10283) +++ gnome-panel/menu.c (working copy) @@ -617,6 +617,91 @@ add_app_to_panel (GtkWidget *item, gmenu_tree_entry_get_desktop_file_path (entry)); } +static char * +lookup_desktop_dir (void) +{ + FILE *file; + char *config_file; + char buffer[512]; + char *user_dir; + char *p, *d; + int len; + int relative; + + config_file = g_build_filename (g_get_user_config_dir (), "user-dirs.dirs", NULL); + file = fopen (config_file, "r"); + free (config_file); + if (file == NULL) + goto error; + + user_dir = NULL; + while (fgets (buffer, sizeof (buffer), file)) + { + /* Remove newline at end */ + len = strlen (buffer); + if (len > 0 && buffer[len-1] == '\n') + buffer[len-1] = 0; + + p = buffer; + while (*p == ' ' || *p == '\t') + p++; + + if (!g_str_has_prefix (p, "XDG_DESKTOP_DIR")) + continue; + p += strlen ("XDG_DESKTOP_DIR"); + + while (*p == ' ' || *p == '\t') + p++; + + if (*p != '=') + continue; + p++; + + while (*p == ' ' || *p == '\t') + p++; + + if (*p != '"') + continue; + p++; + + relative = 0; + if (strncmp (p, "$HOME/", 6) == 0) + { + p += 6; + relative = 1; + } + else if (*p != '/') + continue; + + if (relative) + { + user_dir = g_malloc (strlen (g_get_home_dir()) + 1 + strlen (p) + 1); + strcpy (user_dir, g_get_home_dir ()); + strcat (user_dir, "/"); + } + else + { + user_dir = g_malloc (strlen (p) + 1); + *user_dir = 0; + } + + d = user_dir + strlen (user_dir); + while (*p && *p != '"') + { + if ((*p == '\\') && (*(p+1) != 0)) + p++; + *d++ = *p++; + } + *d = 0; + } + fclose (file); + + if (user_dir) + return user_dir; + + error: + return g_build_filename (g_get_home_dir (), "Desktop", NULL); +} static void add_app_to_desktop (GtkWidget *item, @@ -640,7 +725,7 @@ add_app_to_desktop (GtkWidget *item if (desktop_is_home_dir ()) { target_dir = g_build_filename (g_get_home_dir (), NULL); } else { - target_dir = g_build_filename (g_get_home_dir (), "Desktop", NULL); + target_dir = lookup_desktop_dir (); } target_uri = panel_make_unique_desktop_uri (target_dir, source_uri); Index: gnome-panel/panel-menu-items.c =================================================================== --- gnome-panel/panel-menu-items.c (revision 10283) +++ gnome-panel/panel-menu-items.c (working copy) @@ -119,7 +119,104 @@ activate_uri (GtkWidget *menuitem, } g_free (url); } - + +static char * +lookup_desktop_dir (void) +{ + FILE *file; + char *config_file; + char buffer[512]; + char *user_dir; + char *p, *d; + int len; + int relative; + + config_file = g_build_filename (g_get_user_config_dir (), "user-dirs.dirs", NULL); + file = fopen (config_file, "r"); + free (config_file); + if (file == NULL) + goto error; + + user_dir = NULL; + while (fgets (buffer, sizeof (buffer), file)) + { + /* Remove newline at end */ + len = strlen (buffer); + if (len > 0 && buffer[len-1] == '\n') + buffer[len-1] = 0; + + p = buffer; + while (*p == ' ' || *p == '\t') + p++; + + if (!g_str_has_prefix (p, "XDG_DESKTOP_DIR")) + continue; + p += strlen ("XDG_DESKTOP_DIR"); + + while (*p == ' ' || *p == '\t') + p++; + + if (*p != '=') + continue; + p++; + + while (*p == ' ' || *p == '\t') + p++; + + if (*p != '"') + continue; + p++; + + relative = 0; + if (strncmp (p, "$HOME/", 6) == 0) + { + p += 6; + relative = 1; + } + else if (*p != '/') + continue; + + if (relative) + { + user_dir = g_malloc (strlen (g_get_home_dir()) + 1 + strlen (p) + 1); + strcpy (user_dir, g_get_home_dir ()); + strcat (user_dir, "/"); + } + else + { + user_dir = g_malloc (strlen (p) + 1); + *user_dir = 0; + } + + d = user_dir + strlen (user_dir); + while (*p && *p != '"') + { + if ((*p == '\\') && (*(p+1) != 0)) + p++; + *d++ = *p++; + } + *d = 0; + } + fclose (file); + + if (user_dir) + return user_dir; + + error: + return g_build_filename (g_get_home_dir (), "Desktop", NULL); +} + + +static void +activate_desktop_uri (GtkWidget *menuitem) +{ + char *path; + + path = lookup_desktop_dir (); + activate_uri (menuitem, path); + g_free (path); +} + static void panel_menu_items_append_from_desktop (GtkWidget *menu, char *path, @@ -584,11 +681,6 @@ panel_place_menu_item_create_menu (Panel if (!gconf_client_get_bool (panel_gconf_get_client (), DESKTOP_IS_HOME_DIR_KEY, NULL)) { - char *uri; - - uri = gnome_vfs_make_uri_from_input_with_dirs ("Desktop", - GNOME_VFS_MAKE_URI_DIR_HOMEDIR); - panel_menu_items_append_place_item ( "gnome-fs-desktop", /* Translators: Desktop is used here as in @@ -598,10 +690,8 @@ panel_place_menu_item_create_menu (Panel Q_("Desktop Folder|Desktop"), _("Open the contents of your desktop in a folder"), places_menu, - G_CALLBACK (activate_uri), - uri); - - g_free (uri); + G_CALLBACK (activate_desktop_uri), + NULL); } panel_place_menu_item_append_gtk_bookmarks (places_menu); Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- gnome-panel.spec 28 Feb 2007 05:36:57 -0000 1.182 +++ gnome-panel.spec 6 Mar 2007 16:44:27 -0000 1.183 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.17.92 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.17/%{name}-%{version}.tar.bz2 Source1: redhat-panel-default-setup.entries @@ -95,6 +95,7 @@ # gnome bugzilla 365640 Patch16: gnome-panel-2.16.0-fix-chinese.patch # http://bugzilla.gnome.org/show_bug.cgi?id=395416 +Patch17: gnome-panel-xdg-user-dirs.patch Conflicts: gnome-power-manager < 2.15.3 @@ -128,6 +129,7 @@ %patch13 -p1 -b .move-suspend-to-menu %patch15 -p0 -b .compiz-support %patch16 -p1 -b .fix-chinese +%patch17 -p0 -b .xdg-user-dirs . %{SOURCE4} @@ -301,6 +303,9 @@ %{_datadir}/gtk-doc %changelog +* Tue Mar 6 2007 Alexander Larsson - 2.17.92-1 +- Add xdg-user-dirs patch + * Wed Feb 28 2007 Matthias Clasen 2.17.92-1 - Update to 2.17.92 From fedora-cvs-commits at redhat.com Tue Mar 6 18:19:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 13:19:30 -0500 Subject: rpms/xfsprogs/devel xfsprogs.spec,1.22,1.23 Message-ID: <200703061819.l26IJURU006593@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/xfsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27111 Modified Files: xfsprogs.spec Log Message: - Remove libtermcap-devel from BuildRequires Index: xfsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/xfsprogs/devel/xfsprogs.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xfsprogs.spec 14 Feb 2007 17:50:51 -0000 1.22 +++ xfsprogs.spec 6 Mar 2007 18:19:28 -0000 1.23 @@ -1,7 +1,7 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs Version: 2.8.18 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base URL: http://oss.sgi.com/projects/xfs/ @@ -9,7 +9,7 @@ Source1: xfsprogs-wrapper.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, libtool, gettext -BuildRequires: readline-devel, libtermcap-devel +BuildRequires: readline-devel BuildRequires: /usr/include/uuid/uuid.h Provides: xfs-cmds Obsoletes: xfs-cmds <= %{version} @@ -107,6 +107,9 @@ %{_libdir}/*.so %changelog +* Tue Mar 06 2007 Miroslav Lichvar 2.8.18-3 +- Remove libtermcap-devel from BuildRequires + * Wed Feb 14 2007 Miroslav Lichvar 2.8.18-2 - Disable readline support for now (#223781) From fedora-cvs-commits at redhat.com Tue Mar 6 19:05:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 14:05:31 -0500 Subject: rpms/cups/FC-6 cups-logrotate.patch,NONE,1.1 cups.spec,1.319,1.320 Message-ID: <200703061905.l26J5Via005309@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5241 Modified Files: cups.spec Added Files: cups-logrotate.patch Log Message: * Tue Mar 6 2007 Tim Waugh 1:1.2.8-4 - Use new log file if logrotate rotate the logs (bug #215023). - Resolves: rhbz#215023 cups-logrotate.patch: log.c | 111 ++++++++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 68 insertions(+), 43 deletions(-) --- NEW FILE cups-logrotate.patch --- --- cups-1.2.8/scheduler/log.c.logrotate 2006-10-11 22:04:58.000000000 +0100 +++ cups-1.2.8/scheduler/log.c 2007-03-06 18:46:25.000000000 +0000 @@ -37,6 +37,9 @@ #include "cupsd.h" #include #include +#include +#include +#include /* @@ -427,60 +430,51 @@ return (1); /* - * Format the filename as needed... + * Handle format strings... */ - if (!*lf || - (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize && - MaxLogSize > 0)) - { - /* - * Handle format strings... - */ + filename[sizeof(filename) - 1] = '\0'; - filename[sizeof(filename) - 1] = '\0'; + if (logname[0] != '/') + { + strlcpy(filename, ServerRoot, sizeof(filename)); + strlcat(filename, "/", sizeof(filename)); + } + else + filename[0] = '\0'; - if (logname[0] != '/') + for (ptr = filename + strlen(filename); + *logname && ptr < (filename + sizeof(filename) - 1); + logname ++) + if (*logname == '%') { - strlcpy(filename, ServerRoot, sizeof(filename)); - strlcat(filename, "/", sizeof(filename)); - } - else - filename[0] = '\0'; + /* + * Format spec... + */ - for (ptr = filename + strlen(filename); - *logname && ptr < (filename + sizeof(filename) - 1); - logname ++) - if (*logname == '%') + logname ++; + if (*logname == 's') { - /* - * Format spec... - */ + /* + * Insert the server name... + */ - logname ++; - if (*logname == 's') - { - /* - * Insert the server name... - */ - - strlcpy(ptr, ServerName, sizeof(filename) - (ptr - filename)); - ptr += strlen(ptr); - } - else - { - /* - * Otherwise just insert the character... - */ - - *ptr++ = *logname; - } + strlcpy(ptr, ServerName, sizeof(filename) - (ptr - filename)); + ptr += strlen(ptr); } else + { + /* + * Otherwise just insert the character... + */ + *ptr++ = *logname; + } + } + else + *ptr++ = *logname; - *ptr = '\0'; - } + *ptr = '\0'; /* * See if the log file is open... @@ -512,10 +506,41 @@ } /* + * Has someone else (i.e. logrotate) already rotated the log for us? + */ + else if (strncmp(filename, "/dev/", 5)) + { + struct stat st; + if (stat(filename, &st) || st.st_size == 0) + { + /* File is either missing or has zero size. */ + + cupsFileClose(*lf); + if ((*lf = cupsFileOpen(filename, "a")) == NULL) + { + syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename, + strerror(errno)); + + return (0); + } + + if (strncmp(logname, "/dev/", 5)) + { + /* + * Change ownership and permissions of non-device logs... + */ + + fchown(cupsFileNumber(*lf), RunUser, Group); + fchmod(cupsFileNumber(*lf), LogFilePerm); + } + } + } + + /* * Do we need to rotate the log? */ - if (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize && + if (strncmp(filename, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize && MaxLogSize > 0) { /* Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v retrieving revision 1.319 retrieving revision 1.320 diff -u -r1.319 -r1.320 --- cups.spec 2 Mar 2007 14:58:40 -0000 1.319 +++ cups.spec 6 Mar 2007 19:05:28 -0000 1.320 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -46,6 +46,7 @@ Patch20: cups-getpass.patch Patch21: cups-driverd-timeout.patch Patch22: cups-options.patch +Patch23: cups-logrotate.patch Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -153,6 +154,7 @@ %patch20 -p1 -b .getpass %patch21 -p1 -b .driverd-timeout %patch22 -p1 -b .options +%patch23 -p1 -b .logrotate %if %lspp %patch100 -p1 -b .lspp @@ -436,6 +438,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue Mar 6 2007 Tim Waugh 1:1.2.8-4 +- Use new log file if logrotate rotate the logs (bug #215023). + * Fri Mar 2 2007 Tim Waugh 1:1.2.8-3 - Updated LSPP patch (bug #229673). From fedora-cvs-commits at redhat.com Tue Mar 6 19:12:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 14:12:46 -0500 Subject: rpms/gdm/devel gdm-2.17.7-turnoff-pam-verification.patch, NONE, 1.1 gdm.spec, 1.229, 1.230 Message-ID: <200703061912.l26JCk0V010903@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10779 Modified Files: gdm.spec Added Files: gdm-2.17.7-turnoff-pam-verification.patch Log Message: - turn off pam sanity check because it conflicts with audit gdm-2.17.7-turnoff-pam-verification.patch: verify-pam.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE gdm-2.17.7-turnoff-pam-verification.patch --- --- gdm-2.6.0.8/daemon/verify-pam.c.verify-check 2005-06-21 17:10:14.000000000 +0200 +++ gdm-2.6.0.8/daemon/verify-pam.c 2005-06-21 18:49:50.000000000 +0200 @@ -1467,6 +1467,10 @@ void gdm_verify_check (void) { +/* This check creates spurious audit entries and it isn't necessary + to perform it when gdm is part of the distribution. +*/ +#if 0 pam_handle_t *ph = NULL; if (pam_start ("gdm", NULL, &standalone_pamc, &ph) != PAM_SUCCESS) { @@ -1487,6 +1491,7 @@ closelog (); openlog ("gdm", LOG_PID, LOG_DAEMON); +#endif } /* used in pam */ Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- gdm.spec 28 Feb 2007 13:39:01 -0000 1.229 +++ gdm.spec 6 Mar 2007 19:12:44 -0000 1.230 @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.17.8 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -330,6 +330,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Tue Mar 6 2007 Ray Strode - 1:2.17.8-2 +- turn off pam sanity check because it conflicts with audit + * Wed Feb 28 2007 Matthias Clasen - 1:2.17.8-1 - Update to 2.17.8 From fedora-cvs-commits at redhat.com Tue Mar 6 19:34:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 14:34:29 -0500 Subject: rpms/evolution-data-server/FC-6 evolution-data-server-1.8.3-updated-zoneinfo.patch, NONE, 1.1 evolution-data-server.spec, 1.137, 1.138 Message-ID: <200703061934.l26JYTiQ019359@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-data-server/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19262 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-1.8.3-updated-zoneinfo.patch Log Message: * Tue Mar 06 2007 Matthew Barnes - 1.8.3-3.fc6 - Add patch for GNOME bug #301363 (update timezones). evolution-data-server-1.8.3-updated-zoneinfo.patch: Africa/Cairo.ics | 10 +-- Africa/Tunis.ics | 14 +++- America/Adak.ics | 20 +++--- America/Anchorage.ics | 20 +++--- America/Araguaina.ics | 14 ---- America/Asuncion.ics | 20 +++--- America/Boise.ics | 20 +++--- America/Cambridge_Bay.ics | 20 +++--- America/Chicago.ics | 20 +++--- America/Cuiaba.ics | 10 +-- America/Dawson.ics | 20 +++--- America/Denver.ics | 20 +++--- America/Detroit.ics | 20 +++--- America/Edmonton.ics | 20 +++--- America/Fortaleza.ics | 14 ---- America/Glace_Bay.ics | 20 +++--- America/Goose_Bay.ics | 10 +-- America/Halifax.ics | 20 +++--- America/Indiana/Indianapolis.ics | 14 +++- America/Indiana/Knox.ics | 16 +++- America/Indiana/Marengo.ics | 14 +++- America/Indiana/Vevay.ics | 14 +++- America/Inuvik.ics | 20 +++--- America/Iqaluit.ics | 10 +-- America/Juneau.ics | 20 +++--- America/Kentucky/Louisville.ics | 20 +++--- America/Kentucky/Monticello.ics | 10 +-- America/Los_Angeles.ics | 42 +----------- America/Maceio.ics | 14 ---- America/Menominee.ics | 20 +++--- America/Miquelon.ics | 20 +++--- America/Montevideo.ics | 14 +++- America/Montreal.ics | 20 +++--- America/Nassau.ics | 20 +++--- America/New_York.ics | 20 +++--- America/Nipigon.ics | 20 +++--- America/Nome.ics | 20 +++--- America/North_Dakota/Center.ics | 10 +-- America/Pangnirtung.ics | 10 +-- America/Port-au-Prince.ics | 14 +++- America/Rainy_River.ics | 20 +++--- America/Rankin_Inlet.ics | 20 +++--- America/Recife.ics | 14 ---- America/Sao_Paulo.ics | 10 +-- America/Shiprock.ics | 20 +++--- America/St_Johns.ics | 10 +-- America/Thule.ics | 10 +-- America/Thunder_Bay.ics | 20 +++--- America/Vancouver.ics | 20 +++--- America/Whitehorse.ics | 20 +++--- America/Winnipeg.ics | 10 +-- America/Yakutat.ics | 20 +++--- America/Yellowknife.ics | 20 +++--- Asia/Almaty.ics | 14 ---- Asia/Amman.ics | 16 ++-- Asia/Aqtau.ics | 14 ---- Asia/Aqtobe.ics | 14 ---- Asia/Baku.ics | 6 - Asia/Bishkek.ics | 14 ---- Asia/Choibalsan.ics | 20 +++--- Asia/Colombo.ics | 4 - Asia/Damascus.ics | 16 ++-- Asia/Dili.ics | 4 - Asia/Gaza.ics | 6 - Asia/Hovd.ics | 14 ---- Asia/Istanbul.ics | 6 - Asia/Jerusalem.ics | 129 +-------------------------------------- Asia/Karachi.ics | 14 ---- Asia/Tbilisi.ics | 14 ---- Asia/Tehran.ics | 4 - Asia/Ulaanbaatar.ics | 18 ++--- Atlantic/Bermuda.ics | 20 +++--- Australia/Adelaide.ics | 6 - Australia/Broken_Hill.ics | 6 - Australia/Hobart.ics | 16 ++-- Australia/Lord_Howe.ics | 16 ++-- Australia/Melbourne.ics | 16 ++-- Australia/Perth.ics | 12 ++- Australia/Sydney.ics | 16 ++-- Europe/Istanbul.ics | 6 - Europe/Vilnius.ics | 14 +++- Pacific/Chatham.ics | 16 ++-- Pacific/Tongatapu.ics | 14 ---- 83 files changed, 610 insertions(+), 783 deletions(-) --- NEW FILE evolution-data-server-1.8.3-updated-zoneinfo.patch --- --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Lord_Howe.ics.updated-zoneinfo 2007-01-29 06:32:03.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Lord_Howe.ics 2007-03-06 14:31:31.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Lord_Howe +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Lord_Howe X-LIC-LOCATION:Australia/Lord_Howe -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1030 -TZNAME:LHST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1030 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1030 +TZOFFSETTO:+1030 +TZNAME:LHST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Melbourne.ics.updated-zoneinfo 2007-01-29 06:32:03.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Melbourne.ics 2007-03-06 14:31:31.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Melbourne +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Melbourne X-LIC-LOCATION:Australia/Melbourne -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Broken_Hill.ics.updated-zoneinfo 2007-01-29 06:32:03.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Broken_Hill.ics 2007-03-06 14:31:31.000000000 -0500 @@ -2,7 +2,7 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Broken_Hill +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Broken_Hill X-LIC-LOCATION:Australia/Broken_Hill BEGIN:DAYLIGHT TZOFFSETFROM:+0930 @@ -12,10 +12,10 @@ RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+1030 +TZOFFSETFROM:+0930 TZOFFSETTO:+0930 TZNAME:CST -DTSTART:19700329T030000 +DTSTART:19700329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:STANDARD END:VTIMEZONE --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Perth.ics.updated-zoneinfo 2007-01-29 06:32:03.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Perth.ics 2007-03-06 14:31:31.000000000 -0500 @@ -5,10 +5,16 @@ TZID:/softwarestudio.org/Olson_20011030_5/Australia/Perth X-LIC-LOCATION:Australia/Perth BEGIN:STANDARD -TZOFFSETFROM:+0800 +DTSTART:16010101T030000 +TZOFFSETFROM:+0900 TZOFFSETTO:+0800 -TZNAME:WST -DTSTART:19700101T000000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3 END:STANDARD +BEGIN:DAYLIGHT +DTSTART:16010101T020000 +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Sydney.ics.updated-zoneinfo 2007-01-29 06:32:03.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Sydney.ics 2007-03-06 14:31:31.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Sydney +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Sydney X-LIC-LOCATION:Australia/Sydney -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Adelaide.ics.updated-zoneinfo 2007-01-29 06:32:03.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Adelaide.ics 2007-03-06 14:31:31.000000000 -0500 @@ -2,7 +2,7 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Adelaide +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Adelaide X-LIC-LOCATION:Australia/Adelaide BEGIN:DAYLIGHT TZOFFSETFROM:+0930 @@ -12,10 +12,10 @@ RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+1030 +TZOFFSETFROM:+0930 TZOFFSETTO:+0930 TZNAME:CST -DTSTART:19700329T030000 +DTSTART:19700329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:STANDARD END:VTIMEZONE --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Hobart.ics.updated-zoneinfo 2007-01-29 06:32:03.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Australia/Hobart.ics 2007-03-06 14:31:31.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Hobart +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Hobart X-LIC-LOCATION:Australia/Hobart -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701004T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Pacific/Chatham.ics.updated-zoneinfo 2007-01-29 06:32:03.000000000 -0500 [...2230 lines suppressed...] -RDATE:19900325T000000 -RDATE:19910324T000000 -RDATE:19920329T000000 -RDATE:19930402T000000 -RDATE:19940401T000000 -RDATE:19950331T000000 -RDATE:19960315T000000 -RDATE:19970321T000000 -RDATE:19980320T000000 -RDATE:19990402T020000 -RDATE:20000414T020000 -RDATE:20010409T010000 -RDATE:20020329T010000 -RDATE:20030328T010000 -RDATE:20040407T010000 -RDATE:20050401T020000 -RDATE:20060331T020000 -RDATE:20070330T020000 -RDATE:20080328T020000 -RDATE:20090327T020000 -RDATE:20100326T020000 -RDATE:20110401T020000 -RDATE:20120330T020000 -RDATE:20130329T020000 -RDATE:20140328T020000 -RDATE:20150327T020000 -RDATE:20160401T020000 -RDATE:20170331T020000 -RDATE:20180330T020000 -RDATE:20190329T020000 -RDATE:20200327T020000 -RDATE:20210326T020000 -RDATE:20220401T020000 -RDATE:20230331T020000 -RDATE:20240329T020000 -RDATE:20250328T020000 -RDATE:20260327T020000 -RDATE:20270326T020000 -RDATE:20280331T020000 -RDATE:20290330T020000 -RDATE:20300329T020000 -RDATE:20310328T020000 -RDATE:20320326T020000 -RDATE:20330401T020000 -RDATE:20340331T020000 -RDATE:20350330T020000 -RDATE:20360328T020000 -RDATE:20370327T020000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1FR;BYMONTH=3 END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0300 -TZOFFSETTO:+0200 -TZNAME:IST -DTSTART:19741013T000000 -RDATE:19741013T000000 -RDATE:19750831T000000 -RDATE:19850915T000000 -RDATE:19860907T000000 -RDATE:19870913T000000 -RDATE:19880903T000000 -RDATE:19890903T000000 -RDATE:19900826T000000 -RDATE:19910901T000000 -RDATE:19920906T000000 -RDATE:19930905T000000 -RDATE:19940828T000000 -RDATE:19950903T000000 -RDATE:19960916T000000 -RDATE:19970914T000000 -RDATE:19980906T000000 -RDATE:19990903T020000 -RDATE:20001006T010000 -RDATE:20010924T010000 -RDATE:20021007T010000 -RDATE:20031003T010000 -RDATE:20040922T010000 -RDATE:20051009T020000 -RDATE:20061001T020000 -RDATE:20070916T020000 -RDATE:20081005T020000 -RDATE:20090927T020000 -RDATE:20100912T020000 -RDATE:20111002T020000 -RDATE:20120923T020000 -RDATE:20130908T020000 -RDATE:20140928T020000 -RDATE:20150920T020000 -RDATE:20161009T020000 -RDATE:20170924T020000 -RDATE:20180916T020000 -RDATE:20191006T020000 -RDATE:20200927T020000 -RDATE:20210912T020000 -RDATE:20221002T020000 -RDATE:20230924T020000 -RDATE:20241006T020000 -RDATE:20250928T020000 -RDATE:20260920T020000 -RDATE:20271010T020000 -RDATE:20280924T020000 -RDATE:20290916T020000 -RDATE:20301006T020000 -RDATE:20310921T020000 -RDATE:20320912T020000 -RDATE:20331002T020000 -RDATE:20340917T020000 -RDATE:20351007T020000 -RDATE:20360928T020000 -RDATE:20370913T020000 -END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Atlantic/Bermuda.ics.updated-zoneinfo 2007-01-29 06:32:01.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Atlantic/Bermuda.ics 2007-03-06 14:31:31.000000000 -0500 @@ -2,21 +2,21 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Atlantic/Bermuda +TZID:/softwarestudio.org/Olson_20070227_6/Atlantic/Bermuda X-LIC-LOCATION:Atlantic/Bermuda -BEGIN:STANDARD -TZOFFSETFROM:-0300 -TZOFFSETTO:-0400 -TZNAME:AST -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:ADT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19700308T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19701101T020000 +RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Europe/Vilnius.ics.updated-zoneinfo 2007-01-29 06:32:02.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Europe/Vilnius.ics 2007-03-06 14:31:31.000000000 -0500 @@ -2,13 +2,21 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Europe/Vilnius +TZID:/softwarestudio.org/Olson_20070227_6/Europe/Vilnius X-LIC-LOCATION:Europe/Vilnius -BEGIN:STANDARD +BEGIN:DAYLIGHT TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19700329T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19700101T000000 +DTSTART:19701025T040000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.8.3/calendar/libical/zoneinfo/Europe/Istanbul.ics.updated-zoneinfo 2007-01-29 06:32:02.000000000 -0500 +++ evolution-data-server-1.8.3/calendar/libical/zoneinfo/Europe/Istanbul.ics 2007-03-06 14:31:31.000000000 -0500 @@ -2,20 +2,20 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Europe/Istanbul +TZID:/softwarestudio.org/Olson_20070227_6/Europe/Istanbul X-LIC-LOCATION:Europe/Istanbul BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19700329T010000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD END:VTIMEZONE Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/FC-6/evolution-data-server.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- evolution-data-server.spec 22 Feb 2007 15:38:26 -0000 1.137 +++ evolution-data-server.spec 6 Mar 2007 19:34:27 -0000 1.138 @@ -25,7 +25,7 @@ Name: evolution-data-server Version: 1.8.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -59,6 +59,9 @@ # RH bug #224074 / GNOME bug #405531 Patch19: evolution-data-server-1.8.3-translate-any-category.patch +# GNOME bug #301363 +Patch20: evolution-data-server-1.8.3-updated-zoneinfo.patch + ### Dependencies ### Requires: GConf2 @@ -146,6 +149,7 @@ %patch17 -p1 -b .fix-camel-malloc %patch18 -p1 -b .msgport-fix %patch19 -p1 -b .translate-any-category +%patch20 -p1 -b .updated-zoneinfo mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -363,6 +367,9 @@ %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Tue Mar 06 2007 Matthew Barnes - 1.8.3-3.fc6 +- Add patch for GNOME bug #301363 (update timezones). + * Thu Feb 22 2007 Matthew Barnes - 1.8.3-2.fc6 - Add patch for RH bug #224074 (missing translation breaks contacts). From fedora-cvs-commits at redhat.com Tue Mar 6 19:38:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 14:38:07 -0500 Subject: rpms/evolution-data-server/FC-5 evolution-data-server-1.6.3-updated-zoneinfo.patch, NONE, 1.1 evolution-data-server.spec, 1.93, 1.94 Message-ID: <200703061938.l26Jc7j0016563@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-data-server/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv16547 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-1.6.3-updated-zoneinfo.patch Log Message: * Tue Mar 06 2007 Matthew Barnes - 1.6.3-2.fc5 - Add patch for GNOME bug #301363 (update timezones). evolution-data-server-1.6.3-updated-zoneinfo.patch: Africa/Cairo.ics | 10 +++++----- Africa/Tunis.ics | 14 +++++++++++--- America/Adak.ics | 20 ++++++++++---------- America/Anchorage.ics | 20 ++++++++++---------- America/Araguaina.ics | 14 +++----------- America/Asuncion.ics | 20 ++++++++++---------- America/Boise.ics | 20 ++++++++++---------- America/Cambridge_Bay.ics | 20 ++++++++++---------- America/Chicago.ics | 20 ++++++++++---------- America/Cuiaba.ics | 10 +++++----- America/Dawson.ics | 20 ++++++++++---------- America/Denver.ics | 20 ++++++++++---------- America/Detroit.ics | 20 ++++++++++---------- America/Edmonton.ics | 20 ++++++++++---------- America/Fortaleza.ics | 14 +++----------- America/Glace_Bay.ics | 20 ++++++++++---------- America/Goose_Bay.ics | 10 +++++----- America/Halifax.ics | 20 ++++++++++---------- America/Indiana/Indianapolis.ics | 14 +++++++++++--- America/Indiana/Knox.ics | 16 ++++++++++++---- America/Indiana/Marengo.ics | 14 +++++++++++--- America/Indiana/Vevay.ics | 14 +++++++++++--- America/Inuvik.ics | 20 ++++++++++---------- America/Iqaluit.ics | 10 +++++----- America/Juneau.ics | 20 ++++++++++---------- America/Kentucky/Louisville.ics | 20 ++++++++++---------- America/Kentucky/Monticello.ics | 10 +++++----- America/Los_Angeles.ics | 20 ++++++++++---------- America/Maceio.ics | 14 +++----------- America/Menominee.ics | 20 ++++++++++---------- America/Miquelon.ics | 20 ++++++++++---------- America/Montevideo.ics | 14 +++++++++++--- America/Montreal.ics | 20 ++++++++++---------- America/Nassau.ics | 20 ++++++++++---------- America/New_York.ics | 20 ++++++++++---------- America/Nipigon.ics | 20 ++++++++++---------- America/Nome.ics | 20 ++++++++++---------- America/North_Dakota/Center.ics | 10 +++++----- America/Pangnirtung.ics | 10 +++++----- America/Port-au-Prince.ics | 14 +++++++++++--- America/Rainy_River.ics | 20 ++++++++++---------- America/Rankin_Inlet.ics | 20 ++++++++++---------- America/Recife.ics | 14 +++----------- America/Sao_Paulo.ics | 10 +++++----- America/Shiprock.ics | 20 ++++++++++---------- America/St_Johns.ics | 10 +++++----- America/Thule.ics | 10 +++++----- America/Thunder_Bay.ics | 20 ++++++++++---------- America/Vancouver.ics | 20 ++++++++++---------- America/Whitehorse.ics | 20 ++++++++++---------- America/Winnipeg.ics | 10 +++++----- America/Yakutat.ics | 20 ++++++++++---------- America/Yellowknife.ics | 20 ++++++++++---------- Asia/Almaty.ics | 14 +++----------- Asia/Amman.ics | 16 ++++++++-------- Asia/Aqtau.ics | 14 +++----------- Asia/Aqtobe.ics | 14 +++----------- Asia/Baku.ics | 6 +++--- Asia/Bishkek.ics | 14 +++----------- Asia/Choibalsan.ics | 14 +++++++++++--- Asia/Colombo.ics | 4 ++-- Asia/Damascus.ics | 16 ++++++++-------- Asia/Dili.ics | 4 ++-- Asia/Gaza.ics | 6 +++--- Asia/Hovd.ics | 2 +- Asia/Istanbul.ics | 6 +++--- Asia/Jerusalem.ics | 20 +++++++++----------- Asia/Karachi.ics | 14 +++----------- Asia/Tbilisi.ics | 14 +++----------- Asia/Tehran.ics | 4 ++-- Asia/Ulaanbaatar.ics | 14 +++++++++++--- Atlantic/Bermuda.ics | 20 ++++++++++---------- Australia/Adelaide.ics | 6 +++--- Australia/Broken_Hill.ics | 6 +++--- Australia/Hobart.ics | 16 ++++++++-------- Australia/Lord_Howe.ics | 16 ++++++++-------- Australia/Melbourne.ics | 16 ++++++++-------- Australia/Perth.ics | 12 +++++++++--- Australia/Sydney.ics | 16 ++++++++-------- Europe/Istanbul.ics | 6 +++--- Europe/Vilnius.ics | 14 +++++++++++--- Pacific/Chatham.ics | 16 ++++++++-------- Pacific/Tongatapu.ics | 14 +++----------- 83 files changed, 618 insertions(+), 622 deletions(-) --- NEW FILE evolution-data-server-1.6.3-updated-zoneinfo.patch --- --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Perth.ics.updated-zoneinfo 2001-10-30 07:45:27.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Perth.ics 2007-03-06 14:35:45.000000000 -0500 @@ -5,10 +5,16 @@ TZID:/softwarestudio.org/Olson_20011030_5/Australia/Perth X-LIC-LOCATION:Australia/Perth BEGIN:STANDARD -TZOFFSETFROM:+0800 +DTSTART:16010101T030000 +TZOFFSETFROM:+0900 TZOFFSETTO:+0800 -TZNAME:WST -DTSTART:19700101T000000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3 END:STANDARD +BEGIN:DAYLIGHT +DTSTART:16010101T020000 +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Melbourne.ics.updated-zoneinfo 2001-10-30 07:45:27.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Melbourne.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Melbourne +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Melbourne X-LIC-LOCATION:Australia/Melbourne -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Broken_Hill.ics.updated-zoneinfo 2001-10-30 07:45:27.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Broken_Hill.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,7 +2,7 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Broken_Hill +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Broken_Hill X-LIC-LOCATION:Australia/Broken_Hill BEGIN:DAYLIGHT TZOFFSETFROM:+0930 @@ -12,10 +12,10 @@ RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+1030 +TZOFFSETFROM:+0930 TZOFFSETTO:+0930 TZNAME:CST -DTSTART:19700329T030000 +DTSTART:19700329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:STANDARD END:VTIMEZONE --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Lord_Howe.ics.updated-zoneinfo 2001-10-30 07:45:27.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Lord_Howe.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Lord_Howe +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Lord_Howe X-LIC-LOCATION:Australia/Lord_Howe -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1030 -TZNAME:LHST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1030 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1030 +TZOFFSETTO:+1030 +TZNAME:LHST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Adelaide.ics.updated-zoneinfo 2001-10-30 07:45:27.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Adelaide.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,7 +2,7 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Adelaide +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Adelaide X-LIC-LOCATION:Australia/Adelaide BEGIN:DAYLIGHT TZOFFSETFROM:+0930 @@ -12,10 +12,10 @@ RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+1030 +TZOFFSETFROM:+0930 TZOFFSETTO:+0930 TZNAME:CST -DTSTART:19700329T030000 +DTSTART:19700329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:STANDARD END:VTIMEZONE --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Sydney.ics.updated-zoneinfo 2001-10-30 07:45:28.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Sydney.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Sydney +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Sydney X-LIC-LOCATION:Australia/Sydney -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Hobart.ics.updated-zoneinfo 2001-10-30 07:45:27.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Australia/Hobart.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Hobart +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Hobart X-LIC-LOCATION:Australia/Hobart -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701004T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Pacific/Tongatapu.ics.updated-zoneinfo 2002-07-26 09:52:41.000000000 -0400 [...2063 lines suppressed...] --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Asia/Aqtau.ics.updated-zoneinfo 2002-07-26 09:52:40.000000000 -0400 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Asia/Aqtau.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,21 +2,13 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20020614_6/Asia/Aqtau +TZID:/softwarestudio.org/Olson_20070227_7/Asia/Aqtau X-LIC-LOCATION:Asia/Aqtau -BEGIN:DAYLIGHT -TZOFFSETFROM:+0400 -TZOFFSETTO:+0500 -TZNAME:AQTST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0500 -TZOFFSETTO:+0400 +TZOFFSETTO:+0500 TZNAME:AQTT -DTSTART:19701025T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:19700101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Asia/Damascus.ics.updated-zoneinfo 2001-10-30 07:45:26.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Asia/Damascus.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Asia/Damascus +TZID:/softwarestudio.org/Olson_20070227_6/Asia/Damascus X-LIC-LOCATION:Asia/Damascus -BEGIN:STANDARD -TZOFFSETFROM:+0300 -TZOFFSETTO:+0200 -TZNAME:EET -DTSTART:19701001T000000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 @@ -18,5 +11,12 @@ DTSTART:19700401T000000 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19701001T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Asia/Aqtobe.ics.updated-zoneinfo 2002-07-26 09:52:40.000000000 -0400 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Asia/Aqtobe.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,21 +2,13 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20020614_6/Asia/Aqtobe +TZID:/softwarestudio.org/Olson_20070227_7/Asia/Aqtobe X-LIC-LOCATION:Asia/Aqtobe -BEGIN:DAYLIGHT -TZOFFSETFROM:+0500 -TZOFFSETTO:+0600 -TZNAME:AQTST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+0600 +TZOFFSETFROM:+0500 TZOFFSETTO:+0500 TZNAME:AQTT -DTSTART:19701025T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:19700101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Asia/Choibalsan.ics.updated-zoneinfo 2001-10-30 07:45:26.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Asia/Choibalsan.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,13 +2,21 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_2/Asia/Choibalsan +TZID:/softwarestudio.org/Olson_20070227_3/Asia/Choibalsan X-LIC-LOCATION:Asia/Choibalsan BEGIN:STANDARD -TZOFFSETFROM:+0900 +TZOFFSETFROM:+1000 TZOFFSETTO:+0900 TZNAME:CHOT -DTSTART:19700101T000000 +DTSTART:19700926T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0900 +TZOFFSETTO:+1000 +TZNAME:CHOST +DTSTART:19700328T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Atlantic/Bermuda.ics.updated-zoneinfo 2001-10-30 07:45:27.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Atlantic/Bermuda.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,21 +2,21 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Atlantic/Bermuda +TZID:/softwarestudio.org/Olson_20070227_6/Atlantic/Bermuda X-LIC-LOCATION:Atlantic/Bermuda -BEGIN:STANDARD -TZOFFSETFROM:-0300 -TZOFFSETTO:-0400 -TZNAME:AST -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:ADT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19700308T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19701101T020000 +RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Europe/Vilnius.ics.updated-zoneinfo 2001-10-30 07:45:28.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Europe/Vilnius.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,13 +2,21 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Europe/Vilnius +TZID:/softwarestudio.org/Olson_20070227_6/Europe/Vilnius X-LIC-LOCATION:Europe/Vilnius -BEGIN:STANDARD +BEGIN:DAYLIGHT TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19700329T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19700101T000000 +DTSTART:19701025T040000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.6.3/calendar/libical/zoneinfo/Europe/Istanbul.ics.updated-zoneinfo 2001-10-30 07:45:28.000000000 -0500 +++ evolution-data-server-1.6.3/calendar/libical/zoneinfo/Europe/Istanbul.ics 2007-03-06 14:35:45.000000000 -0500 @@ -2,20 +2,20 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Europe/Istanbul +TZID:/softwarestudio.org/Olson_20070227_6/Europe/Istanbul X-LIC-LOCATION:Europe/Istanbul BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19700329T010000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD END:VTIMEZONE Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- evolution-data-server.spec 4 Aug 2006 14:03:03 -0000 1.93 +++ evolution-data-server.spec 6 Mar 2007 19:38:05 -0000 1.94 @@ -22,7 +22,7 @@ Name: evolution-data-server Version: 1.6.3 -Release: 1.fc5.2 +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for evolution @@ -39,6 +39,9 @@ Patch14: evolution-data-server-1.6.2-validatehelo.patch Patch15: evolution-data-server-1.5.4-make_imap4_optional.patch +# GNOME bug #301363 +Patch16: evolution-data-server-1.6.3-updated-zoneinfo.patch + ### Dependencies ### Requires: GConf2 @@ -119,6 +122,7 @@ %patch13 -p1 -b .fix-implicit-function-declarations %patch14 -p1 -b .validatehelo %patch15 -p1 -b .make_imap4_optional +%patch16 -p1 -b .updated-zoneinfo mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -319,6 +323,9 @@ %changelog +* Tue Mar 06 2007 Matthew Barnes - 1.6.3-2.fc5 +- Add patch for GNOME bug #301363 (update timezones). + * Thu Aug 3 2006 Matthew Barnes - 1.6.3-1.fc5.2 - Remove patches for Gnome.org bug #309079 (rejected upstream). - One of these patches was causing RH bug #167157. From fedora-cvs-commits at redhat.com Tue Mar 6 19:39:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 14:39:53 -0500 Subject: rpms/pm-utils/devel .cvsignore, 1.23, 1.24 pm-utils-0.99.0-disable.patch, 1.1, 1.2 pm-utils.spec, 1.50, 1.51 sources, 1.28, 1.29 60sysfont.hook, 1.2, NONE 65sound.hook, 1.1, NONE Message-ID: <200703061939.l26Jdrnx016659@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/pm-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16643 Modified Files: .cvsignore pm-utils-0.99.0-disable.patch pm-utils.spec sources Removed Files: 60sysfont.hook 65sound.hook Log Message: - update to 0.99.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 20 Feb 2007 20:13:25 -0000 1.23 +++ .cvsignore 6 Mar 2007 19:39:51 -0000 1.24 @@ -1,3 +1,3 @@ radeontool-1.5.tar.gz -pm-utils-0.99.0.tar.gz vbetool_0.7-1.tar.gz +pm-utils-0.99.1.tar.gz pm-utils-0.99.0-disable.patch: defaults | 2 ++ functions | 6 ++++++ 2 files changed, 8 insertions(+) Index: pm-utils-0.99.0-disable.patch =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils-0.99.0-disable.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pm-utils-0.99.0-disable.patch 20 Feb 2007 20:13:25 -0000 1.1 +++ pm-utils-0.99.0-disable.patch 6 Mar 2007 19:39:51 -0000 1.2 @@ -32,8 +32,8 @@ echo -n "platform" > /sys/power/disk echo -n "disk" > /sys/power/state } ---- pm-utils-0.99.0/pm/config.disable 2007-02-20 13:35:07.000000000 -0500 -+++ pm-utils-0.99.0/pm/config 2007-02-20 13:35:10.000000000 -0500 +--- pm-utils-0.99.0/pm/defaults.disable 2007-02-20 13:35:07.000000000 -0500 ++++ pm-utils-0.99.0/pm/defaults 2007-02-20 13:35:10.000000000 -0500 @@ -1,3 +1,5 @@ SUSPEND_MODULES="button" Index: pm-utils.spec =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- pm-utils.spec 20 Feb 2007 20:13:25 -0000 1.50 +++ pm-utils.spec 6 Mar 2007 19:39:51 -0000 1.51 @@ -1,7 +1,7 @@ Name: pm-utils Summary: Power management utilities and scripts for Fedora Core License: GPL -Version: 0.99.0 +Version: 0.99.1 Release: 1%{?dist} Group: System Environment/Base ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 @@ -14,8 +14,6 @@ Source4: pm-suspend.app Source5: pm-hibernate.app Source6: pm-powersave.app -Source7: 60sysfont.hook -Source8: 65sound.hook %define vbever 0.7 Source10: http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{vbever}-1.tar.gz Source20: radeontool-1.5.tar.gz @@ -109,34 +107,32 @@ 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 -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 %pre if [ -f /etc/sysconfig/pm ]; then - mkdir -p /etc/pm - cp -a /etc/sysconfig/pm /etc/pm/config + mkdir -p /etc/pm/config.d + mv /etc/sysconfig/pm /etc/pm/config.d/01oldconfig +fi + +%post +if [ -f /etc/pm/config.rpmsave ]; then + mkdir -p /etc/pm/config.d + mv /etc/pm/config.rpmsave /etc/pm/config.d/02oldconfig fi %files %defattr(-,root,root) -%{_sysconfdir}/pm -%config(noreplace) %{_sysconfdir}/pm/config -%{_sysconfdir}/sysconfig/power-management +%{_sysconfdir}/pm/* %{_sysconfdir}/security/console.apps/* %{_sysconfdir}/pam.d/* +%{_libdir}/pm-utils/bin/* +%{_libdir}/pm-utils/defaults +%{_libdir}/pm-utils/functions +%{_libdir}/pm-utils/power.d/* +%{_libdir}/pm-utils/sleep.d/* %{_bindir}/* %{_sbindir}/* %{_mandir}/man*/* Index: sources =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 20 Feb 2007 20:13:25 -0000 1.28 +++ sources 6 Mar 2007 19:39:51 -0000 1.29 @@ -1,3 +1,3 @@ 8065eebe5a2b163e43b40461bfe49a56 radeontool-1.5.tar.gz 1756f2e71ceaef217220e8e482fce835 vbetool_0.7-1.tar.gz -5f343ffb6cee216ac7426edcd88524e8 pm-utils-0.99.0.tar.gz +572ac2950c25faba52729b4f7e2a6cba pm-utils-0.99.1.tar.gz --- 60sysfont.hook DELETED --- --- 65sound.hook DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 6 19:40:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 14:40:57 -0500 Subject: rpms/kernel/devel linux-2.6-get-order-fix.patch, NONE, 1.1 kernel-2.6.spec, 1.2966, 1.2967 linux-2.6-revert-late-rootfs.patch, 1.1, NONE Message-ID: <200703061940.l26Jevpk016702@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16686 Modified Files: kernel-2.6.spec Added Files: linux-2.6-get-order-fix.patch Removed Files: linux-2.6-revert-late-rootfs.patch Log Message: Proper fix for memory corruption problems linux-2.6-get-order-fix.patch: asm-generic/page.h | 14 +++++++++----- linux/log2.h | 21 ++++++++++++++++++--- 2 files changed, 27 insertions(+), 8 deletions(-) --- NEW FILE linux-2.6-get-order-fix.patch --- >From linux-kernel-owner at vger.kernel.org Tue Mar 6 18:36:40 2007 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Tue, 06 Mar 2007 18:36:40 +0000 Received: from pentafluge.infradead.org ([2001:4bd0:203e::1]) by baythorne.infradead.org with esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1HOeWe-0006p7-K0 for dwmw2 at baythorne.infradead.org; Tue, 06 Mar 2007 18:36:40 +0000 Received: from vger.kernel.org ([209.132.176.167]) by pentafluge.infradead.org with esmtp (Exim 4.63 #1 (Red Hat Linux)) id 1HOeWd-0005jD-QI for dwmw2 at infradead.org; Tue, 06 Mar 2007 18:36:40 +0000 Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand id S965475AbXCFSei (ORCPT ); Tue, 6 Mar 2007 13:34:38 -0500 Received: (majordomo at vger.kernel.org) by vger.kernel.org id S965984AbXCFSeh (ORCPT ); Tue, 6 Mar 2007 13:34:37 -0500 Received: from mx1.redhat.com ([66.187.233.31]:37185 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965475AbXCFSeg (ORCPT ); Tue, 6 Mar 2007 13:34:36 -0500 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.1/8.13.1) with ESMTP id l26IYTE6031460; Tue, 6 Mar 2007 13:34:29 -0500 Received: from warthog.cambridge.redhat.com (warthog.cambridge.redhat.com [172.16.18.73]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l26IYQtb001930; Tue, 6 Mar 2007 13:34:27 -0500 Received: from warthog.cambridge.redhat.com (localhost.localdomain [127.0.0.1]) by warthog.cambridge.redhat.com (8.13.8/8.13.8) with ESMTP id l26IYQ1b010784; Tue, 6 Mar 2007 18:34:26 GMT From: David Howells Subject: [PATCH] Fix get_order() [try #2] To: torvalds at osdl.org, akpm at osdl.org, benh at kernel.crashing.org Cc: linux-kernel at vger.kernel.org, hpa at zytor.com, johannes at sipsolutions.net, dhowells at redhat.com Date: Tue, 06 Mar 2007 18:34:26 +0000 Message-ID: <20070306183426.10768.51800.stgit at warthog.cambridge.redhat.com> User-Agent: StGIT/0.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner at vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel at vger.kernel.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit From: David Howells Provide an ilog2_up() that rounds its result up (ilog2() rounds down). Fix get_order() to use ilog2_up() not ilog2() to get the correct rounding. Adjust the documentation surrounding ilog2() and co. to indicate what rounding they perform. Fix roundup_pow_of_two(1) to give 1, not 0. Signed-Off-By: David Howells --- include/asm-generic/page.h | 14 +++++++++----- include/linux/log2.h | 20 ++++++++++++++++++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h index b55052c..c79dc23 100644 --- a/include/asm-generic/page.h +++ b/include/asm-generic/page.h @@ -17,11 +17,15 @@ static inline __attribute__((const)) int __get_order(unsigned long size, int page_shift) { #if BITS_PER_LONG == 32 && defined(ARCH_HAS_ILOG2_U32) - int order = __ilog2_u32(size) - page_shift; - return order >= 0 ? order : 0; + if (size <= (1UL << page_shift)) + return 0; + else + return __ilog2_u32(size - 1) + 1 - page_shift; #elif BITS_PER_LONG == 64 && defined(ARCH_HAS_ILOG2_U64) - int order = __ilog2_u64(size) - page_shift; - return order >= 0 ? order : 0; + if (size <= (1UL << page_shift)) + return 0; + else + return __ilog2_u64(size - 1) + 1 - page_shift; #else int order; @@ -46,7 +50,7 @@ int __get_order(unsigned long size, int page_shift) #define get_order(n) \ ( \ __builtin_constant_p(n) ? \ - ((n < (1UL << PAGE_SHIFT)) ? 0 : ilog2(n) - PAGE_SHIFT) : \ + ((n < (1UL << PAGE_SHIFT)) ? 0 : ilog2_up(n) - PAGE_SHIFT) : \ __get_order(n, PAGE_SHIFT) \ ) diff --git a/include/linux/log2.h b/include/linux/log2.h index 57e641e..bc3a0eb 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h @@ -70,6 +70,8 @@ unsigned long __roundup_pow_of_two(unsigned long n) * constant-capable log of base 2 calculation * - this can be used to initialise global variables from constant data, hence * the massive ternary operator construction + * - the result is rounded down + * - the result is undefined when n < 1 * * selects the appropriately-sized optimised version depending on sizeof(n) */ @@ -149,6 +151,20 @@ unsigned long __roundup_pow_of_two(unsigned long n) ) /** + * ilog2_up - rounded up log of base 2 of 32-bit or a 64-bit unsigned value + * @n - parameter + * + * constant-capable log of base 2 calculation + * - this can be used to initialise global variables from constant data, hence + * the massive ternary operator construction + * - the result is rounded up + * - the result is undefined when n < 1 + * + * selects the appropriately-sized optimised version depending on sizeof(n) + */ +#define ilog2_up(n) ((n) == 1 ? 0 : ilog2((n) - 1) + 1) + +/** * roundup_pow_of_two - round the given value up to nearest power of two * @n - parameter * @@ -159,8 +175,8 @@ unsigned long __roundup_pow_of_two(unsigned long n) #define roundup_pow_of_two(n) \ ( \ __builtin_constant_p(n) ? ( \ - (n == 1) ? 0 : \ - (1UL << (ilog2((n) - 1) + 1)) \ + (n == 1) ? 1 : \ + (1UL << ilog2_up(n)) \ ) : \ __roundup_pow_of_two(n) \ ) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2966 retrieving revision 1.2967 diff -u -r1.2966 -r1.2967 --- kernel-2.6.spec 5 Mar 2007 22:11:46 -0000 1.2966 +++ kernel-2.6.spec 6 Mar 2007 19:40:55 -0000 1.2967 @@ -342,7 +342,7 @@ # Patch800: linux-2.6-build-nonintconfig.patch Patch801: linux-2.6-build-input-not-embedded.patch -Patch802: linux-2.6-revert-late-rootfs.patch +Patch802: linux-2.6-get-order-fix.patch # Exec-shield. Patch810: linux-2.6-execshield.patch --- linux-2.6-revert-late-rootfs.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 6 19:43:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 14:43:29 -0500 Subject: rpms/evolution-data-server/devel evolution-data-server-1.9.92-updated-zoneinfo.patch, NONE, 1.1 evolution-data-server.spec, 1.148, 1.149 Message-ID: <200703061943.l26JhT6j016825@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16805 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-1.9.92-updated-zoneinfo.patch Log Message: * Tue Mar 06 2007 Matthew Barnes - 1.9.92-2.fc7 - Add patch for GNOME bug #301363 (update timezones). evolution-data-server-1.9.92-updated-zoneinfo.patch: Africa/Cairo.ics | 10 +-- Africa/Tunis.ics | 14 +++- America/Adak.ics | 20 +++--- America/Anchorage.ics | 20 +++--- America/Araguaina.ics | 14 ---- America/Asuncion.ics | 20 +++--- America/Boise.ics | 20 +++--- America/Cambridge_Bay.ics | 20 +++--- America/Chicago.ics | 20 +++--- America/Cuiaba.ics | 10 +-- America/Dawson.ics | 20 +++--- America/Denver.ics | 20 +++--- America/Detroit.ics | 20 +++--- America/Edmonton.ics | 20 +++--- America/Fortaleza.ics | 14 ---- America/Glace_Bay.ics | 20 +++--- America/Goose_Bay.ics | 10 +-- America/Halifax.ics | 20 +++--- America/Indiana/Indianapolis.ics | 14 +++- America/Indiana/Knox.ics | 16 +++- America/Indiana/Marengo.ics | 14 +++- America/Indiana/Vevay.ics | 14 +++- America/Inuvik.ics | 20 +++--- America/Iqaluit.ics | 10 +-- America/Juneau.ics | 20 +++--- America/Kentucky/Louisville.ics | 20 +++--- America/Kentucky/Monticello.ics | 10 +-- America/Los_Angeles.ics | 42 +----------- America/Maceio.ics | 14 ---- America/Menominee.ics | 20 +++--- America/Miquelon.ics | 20 +++--- America/Montevideo.ics | 14 +++- America/Montreal.ics | 20 +++--- America/Nassau.ics | 20 +++--- America/New_York.ics | 20 +++--- America/Nipigon.ics | 20 +++--- America/Nome.ics | 20 +++--- America/North_Dakota/Center.ics | 10 +-- America/Pangnirtung.ics | 10 +-- America/Port-au-Prince.ics | 14 +++- America/Rainy_River.ics | 20 +++--- America/Rankin_Inlet.ics | 20 +++--- America/Recife.ics | 14 ---- America/Sao_Paulo.ics | 10 +-- America/Shiprock.ics | 20 +++--- America/St_Johns.ics | 10 +-- America/Thule.ics | 10 +-- America/Thunder_Bay.ics | 20 +++--- America/Vancouver.ics | 20 +++--- America/Whitehorse.ics | 20 +++--- America/Winnipeg.ics | 10 +-- America/Yakutat.ics | 20 +++--- America/Yellowknife.ics | 20 +++--- Asia/Almaty.ics | 14 ---- Asia/Amman.ics | 16 ++-- Asia/Aqtau.ics | 14 ---- Asia/Aqtobe.ics | 14 ---- Asia/Baku.ics | 6 - Asia/Bishkek.ics | 14 ---- Asia/Choibalsan.ics | 20 +++--- Asia/Colombo.ics | 4 - Asia/Damascus.ics | 16 ++-- Asia/Dili.ics | 4 - Asia/Gaza.ics | 6 - Asia/Hovd.ics | 14 ---- Asia/Istanbul.ics | 6 - Asia/Jerusalem.ics | 129 +-------------------------------------- Asia/Karachi.ics | 14 ---- Asia/Tbilisi.ics | 14 ---- Asia/Tehran.ics | 4 - Asia/Ulaanbaatar.ics | 18 ++--- Atlantic/Bermuda.ics | 20 +++--- Australia/Adelaide.ics | 6 - Australia/Broken_Hill.ics | 6 - Australia/Hobart.ics | 16 ++-- Australia/Lord_Howe.ics | 16 ++-- Australia/Melbourne.ics | 16 ++-- Australia/Perth.ics | 12 ++- Australia/Sydney.ics | 16 ++-- Europe/Istanbul.ics | 6 - Europe/Vilnius.ics | 14 +++- Pacific/Chatham.ics | 16 ++-- Pacific/Tongatapu.ics | 14 ---- 83 files changed, 610 insertions(+), 783 deletions(-) --- NEW FILE evolution-data-server-1.9.92-updated-zoneinfo.patch --- --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Perth.ics.updated-zoneinfo 2007-01-22 12:29:28.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Perth.ics 2007-03-06 14:26:36.000000000 -0500 @@ -5,10 +5,16 @@ TZID:/softwarestudio.org/Olson_20011030_5/Australia/Perth X-LIC-LOCATION:Australia/Perth BEGIN:STANDARD -TZOFFSETFROM:+0800 +DTSTART:16010101T030000 +TZOFFSETFROM:+0900 TZOFFSETTO:+0800 -TZNAME:WST -DTSTART:19700101T000000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3 END:STANDARD +BEGIN:DAYLIGHT +DTSTART:16010101T020000 +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Melbourne.ics.updated-zoneinfo 2007-01-22 12:29:29.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Melbourne.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Melbourne +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Melbourne X-LIC-LOCATION:Australia/Melbourne -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Broken_Hill.ics.updated-zoneinfo 2007-01-22 12:29:29.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Broken_Hill.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,7 +2,7 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Broken_Hill +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Broken_Hill X-LIC-LOCATION:Australia/Broken_Hill BEGIN:DAYLIGHT TZOFFSETFROM:+0930 @@ -12,10 +12,10 @@ RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+1030 +TZOFFSETFROM:+0930 TZOFFSETTO:+0930 TZNAME:CST -DTSTART:19700329T030000 +DTSTART:19700329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:STANDARD END:VTIMEZONE --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Lord_Howe.ics.updated-zoneinfo 2007-01-22 12:29:28.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Lord_Howe.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Lord_Howe +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Lord_Howe X-LIC-LOCATION:Australia/Lord_Howe -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1030 -TZNAME:LHST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1030 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1030 +TZOFFSETTO:+1030 +TZNAME:LHST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Adelaide.ics.updated-zoneinfo 2007-01-22 12:29:29.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Adelaide.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,7 +2,7 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Adelaide +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Adelaide X-LIC-LOCATION:Australia/Adelaide BEGIN:DAYLIGHT TZOFFSETFROM:+0930 @@ -12,10 +12,10 @@ RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+1030 +TZOFFSETFROM:+0930 TZOFFSETTO:+0930 TZNAME:CST -DTSTART:19700329T030000 +DTSTART:19700329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:STANDARD END:VTIMEZONE --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Sydney.ics.updated-zoneinfo 2007-01-22 12:29:29.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Sydney.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Sydney +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Sydney X-LIC-LOCATION:Australia/Sydney -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Hobart.ics.updated-zoneinfo 2007-01-22 12:29:29.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Australia/Hobart.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Australia/Hobart +TZID:/softwarestudio.org/Olson_20070227_6/Australia/Hobart X-LIC-LOCATION:Australia/Hobart -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 @@ -18,5 +11,12 @@ DTSTART:19701004T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Pacific/Tongatapu.ics.updated-zoneinfo 2007-01-22 12:29:30.000000000 -0500 [...2230 lines suppressed...] +TZID:/softwarestudio.org/Olson_20070227_7/Asia/Aqtau X-LIC-LOCATION:Asia/Aqtau -BEGIN:DAYLIGHT -TZOFFSETFROM:+0400 -TZOFFSETTO:+0500 -TZNAME:AQTST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0500 -TZOFFSETTO:+0400 +TZOFFSETTO:+0500 TZNAME:AQTT -DTSTART:19701025T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:19700101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Asia/Damascus.ics.updated-zoneinfo 2007-01-22 12:29:29.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Asia/Damascus.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,15 +2,8 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Asia/Damascus +TZID:/softwarestudio.org/Olson_20070227_6/Asia/Damascus X-LIC-LOCATION:Asia/Damascus -BEGIN:STANDARD -TZOFFSETFROM:+0300 -TZOFFSETTO:+0200 -TZNAME:EET -DTSTART:19701001T000000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 @@ -18,5 +11,12 @@ DTSTART:19700401T000000 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19701001T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Asia/Aqtobe.ics.updated-zoneinfo 2007-01-22 12:29:29.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Asia/Aqtobe.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,21 +2,13 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20020614_6/Asia/Aqtobe +TZID:/softwarestudio.org/Olson_20070227_7/Asia/Aqtobe X-LIC-LOCATION:Asia/Aqtobe -BEGIN:DAYLIGHT -TZOFFSETFROM:+0500 -TZOFFSETTO:+0600 -TZNAME:AQTST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+0600 +TZOFFSETFROM:+0500 TZOFFSETTO:+0500 TZNAME:AQTT -DTSTART:19701025T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:19700101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Asia/Choibalsan.ics.updated-zoneinfo 2007-01-22 12:29:29.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Asia/Choibalsan.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,21 +2,21 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_2/Asia/Choibalsan +TZID:/softwarestudio.org/Olson_20070227_3/Asia/Choibalsan X-LIC-LOCATION:Asia/Choibalsan -BEGIN:DAYLIGHT -TZOFFSETFROM:+0800 +BEGIN:STANDARD +TZOFFSETFROM:+1000 TZOFFSETTO:+0900 TZNAME:CHOT +DTSTART:19700926T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0900 +TZOFFSETTO:+1000 +TZNAME:CHOST DTSTART:19700328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0900 -TZOFFSETTO:+0800 -TZNAME:CHOT -DTSTART:19701024T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SA -END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Atlantic/Bermuda.ics.updated-zoneinfo 2007-01-22 12:29:26.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Atlantic/Bermuda.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,21 +2,21 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Atlantic/Bermuda +TZID:/softwarestudio.org/Olson_20070227_6/Atlantic/Bermuda X-LIC-LOCATION:Atlantic/Bermuda -BEGIN:STANDARD -TZOFFSETFROM:-0300 -TZOFFSETTO:-0400 -TZNAME:AST -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:ADT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19700308T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19701101T020000 +RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Europe/Vilnius.ics.updated-zoneinfo 2007-01-22 12:29:27.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Europe/Vilnius.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,13 +2,21 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Europe/Vilnius +TZID:/softwarestudio.org/Olson_20070227_6/Europe/Vilnius X-LIC-LOCATION:Europe/Vilnius -BEGIN:STANDARD +BEGIN:DAYLIGHT TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19700329T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19700101T000000 +DTSTART:19701025T040000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD END:VTIMEZONE END:VCALENDAR --- evolution-data-server-1.9.92/calendar/libical/zoneinfo/Europe/Istanbul.ics.updated-zoneinfo 2007-01-22 12:29:27.000000000 -0500 +++ evolution-data-server-1.9.92/calendar/libical/zoneinfo/Europe/Istanbul.ics 2007-03-06 14:26:36.000000000 -0500 @@ -2,20 +2,20 @@ PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/softwarestudio.org/Olson_20011030_5/Europe/Istanbul +TZID:/softwarestudio.org/Olson_20070227_6/Europe/Istanbul X-LIC-LOCATION:Europe/Istanbul BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19700329T010000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19701025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD END:VTIMEZONE Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- evolution-data-server.spec 26 Feb 2007 19:09:37 -0000 1.148 +++ evolution-data-server.spec 6 Mar 2007 19:43:27 -0000 1.149 @@ -26,7 +26,7 @@ Name: evolution-data-server Version: 1.9.92 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -69,6 +69,9 @@ # GNOME bug #373117 Patch23: evolution-data-server-1.9.3-e-source-color.patch +# GNOME bug #301363 +Patch24: evolution-data-server-1.9.92-updated-zoneinfo.patch + ### Dependencies ### Requires: GConf2 @@ -160,6 +163,7 @@ %patch21 -p1 -b .fix-name-selector-dialog %patch22 -p1 -b .strftime %patch23 -p1 -b .e-source-color +%patch24 -p1 -b .updated-zoneinfo mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -368,6 +372,9 @@ %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Tue Mar 06 2007 Matthew Barnes - 1.9.92-2.fc7 +- Add patch for GNOME bug #301363 (update timezones). + * Mon Feb 26 2007 Matthew Barnes - 1.9.92-1.fc7 - Update to 1.9.92 - Remove patch for GNOME bug #356177 (fixed upstream). From fedora-cvs-commits at redhat.com Tue Mar 6 20:17:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 15:17:33 -0500 Subject: rpms/nfs-utils/devel .cvsignore, 1.18, 1.19 nfs-utils.spec, 1.119, 1.120 sources, 1.19, 1.20 nfs-utils-1.0.11-fsloc.patch, 1.1, NONE Message-ID: <200703062017.l26KHXbx010687@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10671 Modified Files: .cvsignore nfs-utils.spec sources Removed Files: nfs-utils-1.0.11-fsloc.patch Log Message: Upgraded to 1.0.12 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 22 Feb 2007 21:50:50 -0000 1.18 +++ .cvsignore 6 Mar 2007 20:17:30 -0000 1.19 @@ -8,3 +8,4 @@ nfs-utils-1.0.9.tar.bz2 nfs-utils-1.0.10.tar.bz2 nfs-utils-1.0.11.tar.bz2 +nfs-utils-1.0.12.tar.bz2 Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- nfs-utils.spec 1 Mar 2007 22:34:44 -0000 1.119 +++ nfs-utils.spec 6 Mar 2007 20:17:30 -0000 1.120 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server. Name: nfs-utils -Version: 1.0.11 -Release: 2%{?dist} +Version: 1.0.12 +Release: 1%{?dist} Epoch: 1 # group all 32bit related archs @@ -30,7 +30,6 @@ Patch52: nfs-utils-1.0.6-idmap.conf.patch Patch53: nfs-utils-1.0.6-gssd_mixed_case.patch Patch54: nfs-utils-1.0.8-privports.patch -Patch55: nfs-utils-1.0.11-fsloc.patch %if %{enablemount} Patch70: nfs-utils-1.0.9-mount-options-v3.patch @@ -73,7 +72,7 @@ BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 BuildRequires: nfs-utils-lib-devel >= 1.0.8-2 BuildRequires: libevent-devel libgssapi-devel krb5-devel -BuildRequires: automake, libtool +BuildRequires: automake, libtool, tcp_wrappers-devel PreReq: shadow-utils >= 4.0.3-25 PreReq: /sbin/chkconfig /sbin/nologin PreReq: nfs-utils-lib >= 1.0.8-2 libevent libgssapi @@ -97,7 +96,6 @@ %patch52 -p1 %patch53 -p1 %patch54 -p1 -%patch55 -p1 %if %{enablemount} %patch70 -p1 %patch71 -p1 @@ -287,6 +285,9 @@ %endif %changelog +* Tue Mar 6 2007 Steve Dickson 1.0.12-1 +- Upgraded to 1.0.12 + * Thu Mar 1 2007 Karel Zak 1.0.11-2 - Fixed mount.nfs -f (fake) option (bz 227988) Index: sources =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 22 Feb 2007 21:50:50 -0000 1.19 +++ sources 6 Mar 2007 20:17:30 -0000 1.20 @@ -1,2 +1,2 @@ ae7db9c61c5ad04f83bb99e5caed73da nfs.doc.tar.gz -a5440569b7a995bb25a52bc2ce9fc52f nfs-utils-1.0.11.tar.bz2 +2c4425cad533d327afce16d30a344e19 nfs-utils-1.0.12.tar.bz2 --- nfs-utils-1.0.11-fsloc.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 6 20:26:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 15:26:47 -0500 Subject: rpms/xen/FC-6 pygrub-cursor.patch, 1.1, NONE xen-3.0.1-cloexec.patch, 1.3, NONE xen-3.0.1-config-allow-http.patch, 1.1, NONE xen-3.0.1-m64.patch, 1.1, NONE xen-3.0.1-tempdir.patch, 1.1, NONE xen-blchanges.patch, 1.1, NONE xen-blktap-startup-race.patch, 1.1, NONE xen-change-default-nic.patch, 1.1, NONE xen-check-returns.patch, 1.1, NONE xen-config-allow-http.patch, 1.1, NONE xen-dom0-minmem.patch, 1.2, NONE xen-hvm-nettap.patch, 1.1, NONE xen-hvm-osync.patch, 1.1, NONE xen-ia64-rollup.patch, 1.1, NONE xen-kva-mmap.patch, 1.1, NONE xen-libblktap-symlinks.patch, 1.1, NONE xen-libxenstore-exec.patch, 1.1, NONE xen-misc-fixes.patch, 1.24, NONE xen-pygrub-dont-read-disk.patch, 1.1, NONE xen-rtl8139-fix.patch, 1.1, NONE xen-udevinfo.patch, 1.1, NONE xen-vnclisten-3.patch, 1.1, NONE xen-xenstore-version.patch, 1.1, NONE Message-ID: <200703062026.l26KQlcs004257@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4239 Removed Files: pygrub-cursor.patch xen-3.0.1-cloexec.patch xen-3.0.1-config-allow-http.patch xen-3.0.1-m64.patch xen-3.0.1-tempdir.patch xen-blchanges.patch xen-blktap-startup-race.patch xen-change-default-nic.patch xen-check-returns.patch xen-config-allow-http.patch xen-dom0-minmem.patch xen-hvm-nettap.patch xen-hvm-osync.patch xen-ia64-rollup.patch xen-kva-mmap.patch xen-libblktap-symlinks.patch xen-libxenstore-exec.patch xen-misc-fixes.patch xen-pygrub-dont-read-disk.patch xen-rtl8139-fix.patch xen-udevinfo.patch xen-vnclisten-3.patch xen-xenstore-version.patch Log Message: Removed unused & long since obsolete patches --- pygrub-cursor.patch DELETED --- --- xen-3.0.1-cloexec.patch DELETED --- --- xen-3.0.1-config-allow-http.patch DELETED --- --- xen-3.0.1-m64.patch DELETED --- --- xen-3.0.1-tempdir.patch DELETED --- --- xen-blchanges.patch DELETED --- --- xen-blktap-startup-race.patch DELETED --- --- xen-change-default-nic.patch DELETED --- --- xen-check-returns.patch DELETED --- --- xen-config-allow-http.patch DELETED --- --- xen-dom0-minmem.patch DELETED --- --- xen-hvm-nettap.patch DELETED --- --- xen-hvm-osync.patch DELETED --- --- xen-ia64-rollup.patch DELETED --- --- xen-kva-mmap.patch DELETED --- --- xen-libblktap-symlinks.patch DELETED --- --- xen-libxenstore-exec.patch DELETED --- --- xen-misc-fixes.patch DELETED --- --- xen-pygrub-dont-read-disk.patch DELETED --- --- xen-rtl8139-fix.patch DELETED --- --- xen-udevinfo.patch DELETED --- --- xen-vnclisten-3.patch DELETED --- --- xen-xenstore-version.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 6 21:09:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 16:09:59 -0500 Subject: rpms/kexec-tools/devel .cvsignore, 1.3, 1.4 kexec-tools.spec, 1.75, 1.76 sources, 1.4, 1.5 Message-ID: <200703062109.l26L9xl6002634@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2595 Modified Files: .cvsignore kexec-tools.spec sources Log Message: updating makedumpfile to version 1.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Aug 2006 19:25:03 -0000 1.3 +++ .cvsignore 6 Mar 2007 21:09:57 -0000 1.4 @@ -1,2 +1,3 @@ kexec-tools-1.101.tar.gz makedumpfile.tar.gz +makedumpfile-1.1.1.tar.gz Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- kexec-tools.spec 22 Feb 2007 22:00:39 -0000 1.75 +++ kexec-tools.spec 6 Mar 2007 21:09:57 -0000 1.76 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 61%{?dist} +Release: 62%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -13,7 +13,7 @@ Source6: kdump.sysconfig.ia64 Source7: mkdumprd Source8: kdump.conf -Source9: makedumpfile-1.0.7.tar.gz +Source9: makedumpfile-1.1.1.tar.gz Source10: kexec-kdump-howto.txt Source11: firstboot_kdump.py Source12: mkdumprd.8 @@ -169,6 +169,7 @@ install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8 %ifarch %{ix86} x86_64 ia64 ppc64 install -m 755 makedumpfile/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile +install -m 755 makedumpfile/makedumpfile-R.pl $RPM_BUILD_ROOT/sbin/makedumpfile-reasm %endif CHOMP_SIZE=`echo $RPM_BUILD_ROOT | wc -c` find $RPM_BUILD_ROOT -name '*.mo' | cut -b $CHOMP_SIZE- >> %{name}.lang @@ -236,6 +237,9 @@ %doc kexec-kdump-howto.txt %changelog +* Tue Mar 06 2007 Neil Horman - 1.101-62%{dist} +- Updating makedumpfile to version 1.1.1 (bz 2223743) + * Mon Feb 22 2007 Neil Horman - 1.101-61%{dist} - Adding multilanguage infrastructure to firstboot_kdump (bz 223175) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Dec 2006 21:05:01 -0000 1.4 +++ sources 6 Mar 2007 21:09:57 -0000 1.5 @@ -1,2 +1,2 @@ b4f7ffcc294d41a6a4c40d6e44b7734d kexec-tools-1.101.tar.gz -56fcb4d8e58e22795aeb6c28408916b0 makedumpfile-1.0.7.tar.gz +41c919e362e7fb0e0fbe2b6d9be0de91 makedumpfile-1.1.1.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 6 22:08:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 17:08:04 -0500 Subject: rpms/emacs/devel .cvsignore, 1.18, 1.19 emacs.spec, 1.92, 1.93 sources, 1.19, 1.20 Message-ID: <200703062208.l26M84nq008637@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8621 Modified Files: .cvsignore emacs.spec sources Log Message: new pretest tarball from FSF Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 5 Mar 2007 20:29:47 -0000 1.18 +++ .cvsignore 6 Mar 2007 22:08:02 -0000 1.19 @@ -1,2 +1,2 @@ -emacs-22.0.94.tar.gz +emacs-22.0.95.tar.gz php-mode-1.1.0.tgz Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- emacs.spec 5 Mar 2007 20:29:47 -0000 1.92 +++ emacs.spec 6 Mar 2007 22:08:02 -0000 1.93 @@ -2,7 +2,7 @@ Summary: GNU Emacs text editor Name: emacs -Version: 22.0.94 +Version: 22.0.95 Release: 1%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ @@ -287,6 +287,9 @@ %dir %{_datadir}/emacs/%{version} %changelog +* Tue Mar 6 2007 Chip Coldwell - 22.0.95-1 +- new pretest tarball from FSF + * Mon Feb 26 2007 Chip Coldwell - 22.0.94-1 - new pretest tarball obsoletes loaddefs.el dependencies patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 5 Mar 2007 20:29:47 -0000 1.19 +++ sources 6 Mar 2007 22:08:02 -0000 1.20 @@ -1,2 +1,2 @@ -1bcf94dcce09279f32c05acbd0b98eca emacs-22.0.94.tar.gz +07ae2a749fec6decbdf65ae3673d5546 emacs-22.0.95.tar.gz aad009f7cff4019aac9a466ec9b55aaf php-mode-1.1.0.tgz From fedora-cvs-commits at redhat.com Tue Mar 6 22:22:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 17:22:36 -0500 Subject: rpms/kernel/FC-6/configs config-generic, 1.264, 1.264.28.1 config-powerpc64-iseries, 1.15, 1.15.28.1 config-s390-generic, 1.22, 1.22.28.1 Message-ID: <200703062222.l26MMafS002313@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv2265/configs Modified Files: Tag: private-linville-jwltest-fc6-25-branch config-generic config-powerpc64-iseries config-s390-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v retrieving revision 1.264 retrieving revision 1.264.28.1 diff -u -r1.264 -r1.264.28.1 --- config-generic 8 Jan 2007 16:47:48 -0000 1.264 +++ config-generic 6 Mar 2007 22:22:34 -0000 1.264.28.1 @@ -906,6 +906,9 @@ # CONFIG_TIPC_DEBUG is not set CONFIG_NETLABEL=y +CONFIG_CFG80211=m +# CONFIG_CFG80211_WEXT_COMPAT is not set +# CONFIG_NL80211 is not set # # QoS and/or fair queueing @@ -1063,6 +1066,7 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m +CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_QLA3XXX=m # CONFIG_DGRS is not set @@ -1167,6 +1171,16 @@ # # Wireless 802.11b ISA/PCI cards support # +CONFIG_MAC80211=m +CONFIG_MAC80211_LEDS=y +CONFIG_MAC80211_DEBUG=y +# CONFIG_MAC80211_VERBOSE_DEBUG is not set +CONFIG_MAC80211_LOWTX_FRAME_DUMP=y +CONFIG_TKIP_DEBUG=y +CONFIG_MAC80211_DEBUG_COUNTERS=y +CONFIG_HOSTAPD_WPA_TESTING=y +CONFIG_MAC80211_IBSS_DEBUG=y +CONFIG_MAC80211_VERBOSE_PS_DEBUG=y CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -1181,6 +1195,36 @@ CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +CONFIG_BCM43XX_MAC80211=m +CONFIG_BCM43XX_MAC80211_PCI=y +CONFIG_BCM43XX_MAC80211_PCMCIA=y +CONFIG_BCM43XX_MAC80211_DEBUG=y +CONFIG_BCM43XX_MAC80211_DMA=y +CONFIG_BCM43XX_MAC80211_PIO=y +CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set +# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set +CONFIG_RT2X00=y +CONFIG_RT2400PCI=m +CONFIG_RT2400PCI_DEBUG=y +CONFIG_RT2500PCI=m +CONFIG_RT2500PCI_DEBUG=y +CONFIG_RT61PCI=m +CONFIG_RT61PCI_DEBUG=y +CONFIG_RT2500USB=m +CONFIG_RT2500USB_DEBUG=y +CONFIG_RT73USB=m +CONFIG_RT73USB_DEBUG=y +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ZD1211RW_MAC80211=m +CONFIG_ZD1211RW_MAC80211_DEBUG=y +CONFIG_RTL818X=y +CONFIG_RTL8187=m +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_DEBUG=y CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1529,6 +1573,7 @@ CONFIG_N_HDLC=m # CONFIG_STALDRV is not set # CONFIG_IBM_ASM is not set +CONFIG_SONICS_SILICON_BACKPLANE=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_TCG_TPM=m @@ -1811,6 +1856,14 @@ CONFIG_MAX_RAW_DEVS=8192 CONFIG_HANGCHECK_TIMER=m +CONFIG_SSB=m +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SILENT=n +CONFIG_SSB_DEBUG=n +CONFIG_SSB_SERIAL=n +CONFIG_SSB_DRIVER_PCICORE=y + # # Multimedia devices # @@ -2193,6 +2246,7 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_CS=m +CONFIG_USB_SSB_HCD=m # # USB Device Class drivers @@ -2736,6 +2790,8 @@ # CONFIG_CRC16=m CONFIG_CRC32=m +CONFIG_CRC_ITU_T=m +CONFIG_EEPROM_93CX6=m CONFIG_CRC_CCITT=m CONFIG_ZLIB_INFLATE=y Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-powerpc64-iseries,v retrieving revision 1.15 retrieving revision 1.15.28.1 diff -u -r1.15 -r1.15.28.1 --- config-powerpc64-iseries 21 Dec 2006 21:45:14 -0000 1.15 +++ config-powerpc64-iseries 6 Mar 2007 22:22:34 -0000 1.15.28.1 @@ -56,6 +56,7 @@ CONFIG_SCSI_IBMVSCSI=m CONFIG_SERIAL_ICOM=m # CONFIG_ISDN is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set # CONFIG_DVB is not set # CONFIG_VIDEO_DEV is not set Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v retrieving revision 1.22 retrieving revision 1.22.28.1 diff -u -r1.22 -r1.22.28.1 --- config-s390-generic 21 Dec 2006 21:45:14 -0000 1.22 +++ config-s390-generic 6 Mar 2007 22:22:34 -0000 1.22.28.1 @@ -116,6 +116,7 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_NET_RADIO is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set # The s390 CPU does not have hardware support for big pages at all. From fedora-cvs-commits at redhat.com Tue Mar 6 22:22:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 17:22:35 -0500 Subject: rpms/kernel/FC-6 jwltest-bcm43xx-2_6_20.patch, NONE, 1.1.14.1 jwltest-bcm43xx-host_strip_iv_icv-undo.patch, NONE, 1.1.14.1 jwltest-bcm43xx-post-2_6_20.patch, NONE, 1.1.14.1 jwltest-bcm43xx-workqueue-undo.patch, NONE, 1.1.14.1 jwltest-iwlwifi-2_6_19-fixup.patch, NONE, 1.1.6.1 jwltest-iwlwifi.patch, NONE, 1.1.6.1 jwltest-mac80211-backport-2_6_19-fixup.patch, NONE, 1.1.6.1 jwltest-mac80211-backport.patch, NONE, 1.1.6.1 jwltest-softmac_wx_get_rate-running-check.patch, NONE, 1.1.22.1 kernel-2.6.spec, 1.2911.6.5, 1.2911.6.5.2.1 Message-ID: <200703062222.l26MMZ5s002288@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2265 Modified Files: Tag: private-linville-jwltest-fc6-25-branch kernel-2.6.spec Added Files: Tag: private-linville-jwltest-fc6-25-branch jwltest-bcm43xx-2_6_20.patch jwltest-bcm43xx-host_strip_iv_icv-undo.patch jwltest-bcm43xx-post-2_6_20.patch jwltest-bcm43xx-workqueue-undo.patch jwltest-iwlwifi-2_6_19-fixup.patch jwltest-iwlwifi.patch jwltest-mac80211-backport-2_6_19-fixup.patch jwltest-mac80211-backport.patch jwltest-softmac_wx_get_rate-running-check.patch Log Message: jwltest-bcm43xx-2_6_20.patch: bcm43xx.h | 34 ++++++++ bcm43xx_main.c | 228 ++++++++++++++++++++++++++++++++------------------------ bcm43xx_power.c | 28 +++++- bcm43xx_wx.c | 4 bcm43xx_xmit.c | 18 ---- 5 files changed, 188 insertions(+), 124 deletions(-) --- NEW FILE jwltest-bcm43xx-2_6_20.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h.orig 2007-02-08 14:17:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h 2007-02-08 14:34:46.000000000 -0500 @@ -159,6 +159,7 @@ /* Chipcommon registers. */ #define BCM43xx_CHIPCOMMON_CAPABILITIES 0x04 +#define BCM43xx_CHIPCOMMON_CTL 0x28 #define BCM43xx_CHIPCOMMON_PLLONDELAY 0xB0 #define BCM43xx_CHIPCOMMON_FREFSELDELAY 0xB4 #define BCM43xx_CHIPCOMMON_SLOWCLKCTL 0xB8 @@ -172,6 +173,33 @@ /* SBTOPCI2 values. */ #define BCM43xx_SBTOPCI2_PREFETCH 0x4 #define BCM43xx_SBTOPCI2_BURST 0x8 +#define BCM43xx_SBTOPCI2_MEMREAD_MULTI 0x20 + +/* PCI-E core registers. */ +#define BCM43xx_PCIECORE_REG_ADDR 0x0130 +#define BCM43xx_PCIECORE_REG_DATA 0x0134 +#define BCM43xx_PCIECORE_MDIO_CTL 0x0128 +#define BCM43xx_PCIECORE_MDIO_DATA 0x012C + +/* PCI-E registers. */ +#define BCM43xx_PCIE_TLP_WORKAROUND 0x0004 +#define BCM43xx_PCIE_DLLP_LINKCTL 0x0100 + +/* PCI-E MDIO bits. */ +#define BCM43xx_PCIE_MDIO_ST 0x40000000 +#define BCM43xx_PCIE_MDIO_WT 0x10000000 +#define BCM43xx_PCIE_MDIO_DEV 22 +#define BCM43xx_PCIE_MDIO_REG 18 +#define BCM43xx_PCIE_MDIO_TA 0x00020000 +#define BCM43xx_PCIE_MDIO_TC 0x0100 + +/* MDIO devices. */ +#define BCM43xx_MDIO_SERDES_RX 0x1F + +/* SERDES RX registers. */ +#define BCM43xx_SERDES_RXTIMER 0x2 +#define BCM43xx_SERDES_CDR 0x6 +#define BCM43xx_SERDES_CDR_BW 0x7 /* Chipcommon capabilities. */ #define BCM43xx_CAPABILITIES_PCTL 0x00040000 @@ -221,6 +249,7 @@ #define BCM43xx_COREID_USB20_HOST 0x819 #define BCM43xx_COREID_USB20_DEV 0x81a #define BCM43xx_COREID_SDIO_HOST 0x81b +#define BCM43xx_COREID_PCIE 0x820 /* Core Information Registers */ #define BCM43xx_CIR_BASE 0xf00 @@ -365,6 +394,9 @@ #define BCM43xx_DEFAULT_SHORT_RETRY_LIMIT 7 #define BCM43xx_DEFAULT_LONG_RETRY_LIMIT 4 +/* FIXME: the next line is a guess as to what the maximum RSSI value might be */ +#define RX_RSSI_MAX 60 + /* Max size of a security key */ #define BCM43xx_SEC_KEYSIZE 16 /* Security algorithms. */ @@ -787,7 +819,7 @@ struct bcm43xx_private { struct tasklet_struct isr_tasklet; /* Periodic tasks */ - struct work_struct periodic_work; + struct delayed_work periodic_work; unsigned int periodic_state; struct work_struct restart_work; --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c.orig 2006-11-29 16:57:37.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c 2007-02-08 14:34:46.000000000 -0500 @@ -47,9 +47,6 @@ #define BCM43xx_WX_VERSION 18 #define MAX_WX_STRING 80 -/* FIXME: the next line is a guess as to what the maximum RSSI value might be */ -#define RX_RSSI_MAX 60 - static int bcm43xx_wx_get_name(struct net_device *net_dev, struct iw_request_info *info, @@ -693,6 +690,7 @@ static int bcm43xx_wx_set_swencryption(s bcm->ieee->host_encrypt = !!on; bcm->ieee->host_decrypt = !!on; bcm->ieee->host_build_iv = !on; + bcm->ieee->host_strip_iv_icv = !on; spin_unlock_irqrestore(&bcm->irq_lock, flags); mutex_unlock(&bcm->mutex); --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig 2007-02-08 14:17:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2007-02-08 14:34:46.000000000 -0500 @@ -130,6 +130,10 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for { PCI_VENDOR_ID_BROADCOM, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Broadcom 4307 802.11b */ { PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + /* Broadcom 4311 802.11(a)/b/g */ + { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + /* Broadcom 4312 802.11a/b/g */ + { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Broadcom 4318 802.11b/g */ { PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Broadcom 4319 802.11a/b/g */ @@ -2600,8 +2604,9 @@ static int bcm43xx_probe_cores(struct bc /* fetch sb_id_hi from core information registers */ sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI); - core_id = (sb_id_hi & 0xFFF0) >> 4; - core_rev = (sb_id_hi & 0xF); + core_id = (sb_id_hi & 0x8FF0) >> 4; + core_rev = (sb_id_hi & 0x7000) >> 8; + core_rev |= (sb_id_hi & 0xF); core_vendor = (sb_id_hi & 0xFFFF0000) >> 16; /* if present, chipcommon is always core 0; read the chipid from it */ @@ -2679,14 +2684,10 @@ static int bcm43xx_probe_cores(struct bc bcm->chip_id, bcm->chip_rev); dprintk(KERN_INFO PFX "Number of cores: %d\n", core_count); if (bcm->core_chipcommon.available) { - dprintk(KERN_INFO PFX "Core 0: ID 0x%x, rev 0x%x, vendor 0x%x, %s\n", - core_id, core_rev, core_vendor, - bcm43xx_core_enabled(bcm) ? "enabled" : "disabled"); - } - - if (bcm->core_chipcommon.available) + dprintk(KERN_INFO PFX "Core 0: ID 0x%x, rev 0x%x, vendor 0x%x\n", + core_id, core_rev, core_vendor); current_core = 1; - else + } else current_core = 0; for ( ; current_core < core_count; current_core++) { struct bcm43xx_coreinfo *core; @@ -2700,17 +2701,17 @@ static int bcm43xx_probe_cores(struct bc sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI); /* extract core_id, core_rev, core_vendor */ - core_id = (sb_id_hi & 0xFFF0) >> 4; - core_rev = (sb_id_hi & 0xF); + core_id = (sb_id_hi & 0x8FF0) >> 4; + core_rev = ((sb_id_hi & 0xF) | ((sb_id_hi & 0x7000) >> 8)); core_vendor = (sb_id_hi & 0xFFFF0000) >> 16; - dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x, %s\n", - current_core, core_id, core_rev, core_vendor, - bcm43xx_core_enabled(bcm) ? "enabled" : "disabled" ); + dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x\n", + current_core, core_id, core_rev, core_vendor); core = NULL; switch (core_id) { case BCM43xx_COREID_PCI: + case BCM43xx_COREID_PCIE: core = &bcm->core_pci; if (core->available) { printk(KERN_WARNING PFX "Multiple PCI cores found.\n"); @@ -2749,12 +2750,12 @@ static int bcm43xx_probe_cores(struct bc case 6: case 7: case 9: + case 10: break; default: - printk(KERN_ERR PFX "Error: Unsupported 80211 core revision %u\n", + printk(KERN_WARNING PFX + "Unsupported 80211 core revision %u\n", core_rev); - err = -ENODEV; - goto out; } bcm->nr_80211_available++; core->priv = ext_80211; @@ -2868,16 +2869,14 @@ static int bcm43xx_wireless_core_init(st u32 sbimconfiglow; u8 limit; - if (bcm->chip_rev < 5) { + if (bcm->core_pci.rev <= 5 && bcm->core_pci.id != BCM43xx_COREID_PCIE) { sbimconfiglow = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW); sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK; sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK; if (bcm->bustype == BCM43xx_BUSTYPE_PCI) sbimconfiglow |= 0x32; - else if (bcm->bustype == BCM43xx_BUSTYPE_SB) - sbimconfiglow |= 0x53; else - assert(0); + sbimconfiglow |= 0x53; bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, sbimconfiglow); } @@ -3004,22 +3003,64 @@ static void bcm43xx_pcicore_broadcast_va static int bcm43xx_pcicore_commit_settings(struct bcm43xx_private *bcm) { - int err; - struct bcm43xx_coreinfo *old_core; + int err = 0; - old_core = bcm->current_core; - err = bcm43xx_switch_core(bcm, &bcm->core_pci); - if (err) - goto out; + bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL); - bcm43xx_pcicore_broadcast_value(bcm, 0xfd8, 0x00000000); + if (bcm->core_chipcommon.available) { + err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon); + if (err) + goto out; + + bcm43xx_pcicore_broadcast_value(bcm, 0xfd8, 0x00000000); + + /* this function is always called when a PCI core is mapped */ + err = bcm43xx_switch_core(bcm, &bcm->core_pci); + if (err) + goto out; + } else + bcm43xx_pcicore_broadcast_value(bcm, 0xfd8, 0x00000000); + + bcm43xx_interrupt_enable(bcm, bcm->irq_savedstate); - bcm43xx_switch_core(bcm, old_core); - assert(err == 0); out: return err; } +static u32 bcm43xx_pcie_reg_read(struct bcm43xx_private *bcm, u32 address) +{ + bcm43xx_write32(bcm, BCM43xx_PCIECORE_REG_ADDR, address); + return bcm43xx_read32(bcm, BCM43xx_PCIECORE_REG_DATA); +} + +static void bcm43xx_pcie_reg_write(struct bcm43xx_private *bcm, u32 address, + u32 data) +{ + bcm43xx_write32(bcm, BCM43xx_PCIECORE_REG_ADDR, address); + bcm43xx_write32(bcm, BCM43xx_PCIECORE_REG_DATA, data); +} + +static void bcm43xx_pcie_mdio_write(struct bcm43xx_private *bcm, u8 dev, u8 reg, + u16 data) +{ + int i; + + bcm43xx_write32(bcm, BCM43xx_PCIECORE_MDIO_CTL, 0x0082); + bcm43xx_write32(bcm, BCM43xx_PCIECORE_MDIO_DATA, BCM43xx_PCIE_MDIO_ST | + BCM43xx_PCIE_MDIO_WT | (dev << BCM43xx_PCIE_MDIO_DEV) | + (reg << BCM43xx_PCIE_MDIO_REG) | BCM43xx_PCIE_MDIO_TA | + data); + udelay(10); + + for (i = 0; i < 10; i++) { + if (bcm43xx_read32(bcm, BCM43xx_PCIECORE_MDIO_CTL) & + BCM43xx_PCIE_MDIO_TC) + break; + msleep(1); + } + bcm43xx_write32(bcm, BCM43xx_PCIECORE_MDIO_CTL, 0); +} + /* Make an I/O Core usable. "core_mask" is the bitmask of the cores to enable. * To enable core 0, pass a core_mask of 1<<0 */ @@ -3039,7 +3080,8 @@ static int bcm43xx_setup_backplane_pci_c if (err) goto out; - if (bcm->core_pci.rev < 6) { + if (bcm->current_core->rev < 6 && + bcm->current_core->id == BCM43xx_COREID_PCI) { value = bcm43xx_read32(bcm, BCM43xx_CIR_SBINTVEC); value |= (1 << backplane_flag_nr); bcm43xx_write32(bcm, BCM43xx_CIR_SBINTVEC, value); @@ -3057,21 +3099,46 @@ static int bcm43xx_setup_backplane_pci_c } } - value = bcm43xx_read32(bcm, BCM43xx_PCICORE_SBTOPCI2); - value |= BCM43xx_SBTOPCI2_PREFETCH | BCM43xx_SBTOPCI2_BURST; - bcm43xx_write32(bcm, BCM43xx_PCICORE_SBTOPCI2, value); - - if (bcm->core_pci.rev < 5) { - value = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW); - value |= (2 << BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_SHIFT) - & BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK; - value |= (3 << BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_SHIFT) - & BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK; - bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, value); - err = bcm43xx_pcicore_commit_settings(bcm); - assert(err == 0); + if (bcm->current_core->id == BCM43xx_COREID_PCI) { + value = bcm43xx_read32(bcm, BCM43xx_PCICORE_SBTOPCI2); + value |= BCM43xx_SBTOPCI2_PREFETCH | BCM43xx_SBTOPCI2_BURST; + bcm43xx_write32(bcm, BCM43xx_PCICORE_SBTOPCI2, value); + + if (bcm->current_core->rev < 5) { + value = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW); + value |= (2 << BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_SHIFT) + & BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK; + value |= (3 << BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_SHIFT) + & BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK; + bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, value); + err = bcm43xx_pcicore_commit_settings(bcm); + assert(err == 0); + } else if (bcm->current_core->rev >= 11) { + value = bcm43xx_read32(bcm, BCM43xx_PCICORE_SBTOPCI2); + value |= BCM43xx_SBTOPCI2_MEMREAD_MULTI; + bcm43xx_write32(bcm, BCM43xx_PCICORE_SBTOPCI2, value); + } + } else { + if (bcm->current_core->rev == 0 || bcm->current_core->rev == 1) { + value = bcm43xx_pcie_reg_read(bcm, BCM43xx_PCIE_TLP_WORKAROUND); + value |= 0x8; + bcm43xx_pcie_reg_write(bcm, BCM43xx_PCIE_TLP_WORKAROUND, + value); + } + if (bcm->current_core->rev == 0) { + bcm43xx_pcie_mdio_write(bcm, BCM43xx_MDIO_SERDES_RX, + BCM43xx_SERDES_RXTIMER, 0x8128); + bcm43xx_pcie_mdio_write(bcm, BCM43xx_MDIO_SERDES_RX, + BCM43xx_SERDES_CDR, 0x0100); + bcm43xx_pcie_mdio_write(bcm, BCM43xx_MDIO_SERDES_RX, + BCM43xx_SERDES_CDR_BW, 0x1466); + } else if (bcm->current_core->rev == 1) { + value = bcm43xx_pcie_reg_read(bcm, BCM43xx_PCIE_DLLP_LINKCTL); + value |= 0x40; + bcm43xx_pcie_reg_write(bcm, BCM43xx_PCIE_DLLP_LINKCTL, + value); + } } - out_switch_back: err = bcm43xx_switch_core(bcm, old_core); out: @@ -3140,55 +3207,28 @@ static void bcm43xx_periodic_every15sec( static void do_periodic_work(struct bcm43xx_private *bcm) { - unsigned int state; - - state = bcm->periodic_state; - if (state % 8 == 0) + if (bcm->periodic_state % 8 == 0) bcm43xx_periodic_every120sec(bcm); - if (state % 4 == 0) + if (bcm->periodic_state % 4 == 0) bcm43xx_periodic_every60sec(bcm); - if (state % 2 == 0) + if (bcm->periodic_state % 2 == 0) bcm43xx_periodic_every30sec(bcm); - if (state % 1 == 0) - bcm43xx_periodic_every15sec(bcm); - bcm->periodic_state = state + 1; + bcm43xx_periodic_every15sec(bcm); schedule_delayed_work(&bcm->periodic_work, HZ * 15); } -/* Estimate a "Badness" value based on the periodic work - * state-machine state. "Badness" is worse (bigger), if the - * periodic work will take longer. - */ -static int estimate_periodic_work_badness(unsigned int state) -{ - int badness = 0; - - if (state % 8 == 0) /* every 120 sec */ - badness += 10; - if (state % 4 == 0) /* every 60 sec */ - badness += 5; - if (state % 2 == 0) /* every 30 sec */ - badness += 1; - if (state % 1 == 0) /* every 15 sec */ - badness += 1; - -#define BADNESS_LIMIT 4 - return badness; -} - -static void bcm43xx_periodic_work_handler(void *d) +static void bcm43xx_periodic_work_handler(struct work_struct *work) { - struct bcm43xx_private *bcm = d; + struct bcm43xx_private *bcm = + container_of(work, struct bcm43xx_private, periodic_work.work); struct net_device *net_dev = bcm->net_dev; unsigned long flags; u32 savedirqs = 0; - int badness; unsigned long orig_trans_start = 0; mutex_lock(&bcm->mutex); - badness = estimate_periodic_work_badness(bcm->periodic_state); - if (badness > BADNESS_LIMIT) { + if (unlikely(bcm->periodic_state % 4 == 0)) { /* Periodic work will take a long time, so we want it to * be preemtible. */ @@ -3220,7 +3260,7 @@ static void bcm43xx_periodic_work_handle do_periodic_work(bcm); - if (badness > BADNESS_LIMIT) { + if (unlikely(bcm->periodic_state % 4 == 0)) { spin_lock_irqsave(&bcm->irq_lock, flags); tasklet_enable(&bcm->isr_tasklet); bcm43xx_interrupt_enable(bcm, savedirqs); @@ -3231,6 +3271,7 @@ static void bcm43xx_periodic_work_handle net_dev->trans_start = orig_trans_start; } mmiowb(); + bcm->periodic_state++; spin_unlock_irqrestore(&bcm->irq_lock, flags); mutex_unlock(&bcm->mutex); } @@ -3242,11 +3283,11 @@ void bcm43xx_periodic_tasks_delete(struc void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm) { - struct work_struct *work = &(bcm->periodic_work); + struct delayed_work *work = &bcm->periodic_work; assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED); - INIT_WORK(work, bcm43xx_periodic_work_handler, bcm); - schedule_work(work); + INIT_DELAYED_WORK(work, bcm43xx_periodic_work_handler); + schedule_delayed_work(work, 0); } static void bcm43xx_security_init(struct bcm43xx_private *bcm) @@ -3598,7 +3639,7 @@ static int bcm43xx_init_board(struct bcm bcm43xx_periodic_tasks_setup(bcm); /*FIXME: This should be handled by softmac instead. */ - schedule_work(&bcm->softmac->associnfo.work); + schedule_delayed_work(&bcm->softmac->associnfo.work, 0); out: mutex_unlock(&(bcm)->mutex); @@ -3676,7 +3717,7 @@ static int bcm43xx_read_phyinfo(struct b bcm->ieee->freq_band = IEEE80211_24GHZ_BAND; break; case BCM43xx_PHYTYPE_G: - if (phy_rev > 7) + if (phy_rev > 8) phy_rev_ok = 0; bcm->ieee->modulation = IEEE80211_OFDM_MODULATION | IEEE80211_CCK_MODULATION; @@ -3688,6 +3729,8 @@ static int bcm43xx_read_phyinfo(struct b phy_type); return -ENODEV; }; + bcm->ieee->perfect_rssi = RX_RSSI_MAX; + bcm->ieee->worst_rssi = 0; if (!phy_rev_ok) { printk(KERN_WARNING PFX "Invalid PHY Revision %x\n", phy_rev); @@ -3974,11 +4017,6 @@ static int bcm43xx_ieee80211_hard_start_ return NETDEV_TX_OK; } -static struct net_device_stats * bcm43xx_net_get_stats(struct net_device *net_dev) -{ - return &(bcm43xx_priv(net_dev)->ieee->stats); -} - static void bcm43xx_net_tx_timeout(struct net_device *net_dev) { struct bcm43xx_private *bcm = bcm43xx_priv(net_dev); @@ -4092,7 +4130,6 @@ static int __devinit bcm43xx_init_one(st net_dev->open = bcm43xx_net_open; net_dev->stop = bcm43xx_net_stop; - net_dev->get_stats = bcm43xx_net_get_stats; net_dev->tx_timeout = bcm43xx_net_tx_timeout; #ifdef CONFIG_NET_POLL_CONTROLLER net_dev->poll_controller = bcm43xx_net_poll_controller; @@ -4149,9 +4186,10 @@ static void __devexit bcm43xx_remove_one /* Hard-reset the chip. Do not call this directly. * Use bcm43xx_controller_restart() */ -static void bcm43xx_chip_reset(void *_bcm) +static void bcm43xx_chip_reset(struct work_struct *work) { - struct bcm43xx_private *bcm = _bcm; + struct bcm43xx_private *bcm = + container_of(work, struct bcm43xx_private, restart_work); struct bcm43xx_phyinfo *phy; int err = -ENODEV; @@ -4178,7 +4216,7 @@ void bcm43xx_controller_restart(struct b if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) return; printk(KERN_ERR PFX "Controller RESET (%s) ...\n", reason); - INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset, bcm); + INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset); schedule_work(&bcm->restart_work); } --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_power.c.orig 2007-02-08 14:17:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_power.c 2007-02-08 14:34:46.000000000 -0500 @@ -153,8 +153,6 @@ int bcm43xx_pctl_init(struct bcm43xx_pri int err, maxfreq; struct bcm43xx_coreinfo *old_core; - if (!(bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL)) - return 0; old_core = bcm->current_core; err = bcm43xx_switch_core(bcm, &bcm->core_chipcommon); if (err == -ENODEV) @@ -162,11 +160,27 @@ int bcm43xx_pctl_init(struct bcm43xx_pri if (err) goto out; - maxfreq = bcm43xx_pctl_clockfreqlimit(bcm, 1); - bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_PLLONDELAY, - (maxfreq * 150 + 999999) / 1000000); - bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_FREFSELDELAY, - (maxfreq * 15 + 999999) / 1000000); + if (bcm->chip_id == 0x4321) { + if (bcm->chip_rev == 0) + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_CTL, 0x03A4); + if (bcm->chip_rev == 1) + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_CTL, 0x00A4); + } + + if (bcm->chipcommon_capabilities & BCM43xx_CAPABILITIES_PCTL) { + if (bcm->current_core->rev >= 10) { + /* Set Idle Power clock rate to 1Mhz */ + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_SYSCLKCTL, + (bcm43xx_read32(bcm, BCM43xx_CHIPCOMMON_SYSCLKCTL) + & 0x0000FFFF) | 0x40000); + } else { + maxfreq = bcm43xx_pctl_clockfreqlimit(bcm, 1); + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_PLLONDELAY, + (maxfreq * 150 + 999999) / 1000000); + bcm43xx_write32(bcm, BCM43xx_CHIPCOMMON_FREFSELDELAY, + (maxfreq * 15 + 999999) / 1000000); + } + } err = bcm43xx_switch_core(bcm, old_core); assert(err == 0); --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c.orig 2006-11-29 16:57:37.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c 2007-02-08 14:34:46.000000000 -0500 @@ -544,24 +544,6 @@ int bcm43xx_rx(struct bcm43xx_private *b } frame_ctl = le16_to_cpu(wlhdr->frame_ctl); - if ((frame_ctl & IEEE80211_FCTL_PROTECTED) && !bcm->ieee->host_decrypt) { - frame_ctl &= ~IEEE80211_FCTL_PROTECTED; - wlhdr->frame_ctl = cpu_to_le16(frame_ctl); - /* trim IV and ICV */ - /* FIXME: this must be done only for WEP encrypted packets */ - if (skb->len < 32) { - dprintkl(KERN_ERR PFX "RX packet dropped (PROTECTED flag " - "set and length < 32)\n"); - return -EINVAL; - } else { - memmove(skb->data + 4, skb->data, 24); - skb_pull(skb, 4); - skb_trim(skb, skb->len - 4); - stats.len -= 8; - } - wlhdr = (struct ieee80211_hdr_4addr *)(skb->data); - } - switch (WLAN_FC_GET_TYPE(frame_ctl)) { case IEEE80211_FTYPE_MGMT: ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats); jwltest-bcm43xx-host_strip_iv_icv-undo.patch: bcm43xx_wx.c | 1 - bcm43xx_xmit.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) --- NEW FILE jwltest-bcm43xx-host_strip_iv_icv-undo.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c.orig 2007-02-08 15:50:54.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c 2007-02-08 15:49:59.000000000 -0500 @@ -690,7 +690,6 @@ static int bcm43xx_wx_set_swencryption(s bcm->ieee->host_encrypt = !!on; bcm->ieee->host_decrypt = !!on; bcm->ieee->host_build_iv = !on; - bcm->ieee->host_strip_iv_icv = !on; spin_unlock_irqrestore(&bcm->irq_lock, flags); mutex_unlock(&bcm->mutex); --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c.orig 2007-02-08 15:48:53.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c 2007-02-08 15:49:59.000000000 -0500 @@ -544,6 +544,24 @@ int bcm43xx_rx(struct bcm43xx_private *b } frame_ctl = le16_to_cpu(wlhdr->frame_ctl); + if ((frame_ctl & IEEE80211_FCTL_PROTECTED) && !bcm->ieee->host_decrypt) { + frame_ctl &= ~IEEE80211_FCTL_PROTECTED; + wlhdr->frame_ctl = cpu_to_le16(frame_ctl); + /* trim IV and ICV */ + /* FIXME: this must be done only for WEP encrypted packets */ + if (skb->len < 32) { + dprintkl(KERN_ERR PFX "RX packet dropped (PROTECTED flag " + "set and length < 32)\n"); + return -EINVAL; + } else { + memmove(skb->data + 4, skb->data, 24); + skb_pull(skb, 4); + skb_trim(skb, skb->len - 4); + stats.len -= 8; + } + wlhdr = (struct ieee80211_hdr_4addr *)(skb->data); + } + switch (WLAN_FC_GET_TYPE(frame_ctl)) { case IEEE80211_FTYPE_MGMT: ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats); jwltest-bcm43xx-post-2_6_20.patch: bcm43xx.h | 7 -- bcm43xx_dma.c | 171 +++++++++++++++++++++++++++++++++++-------------- bcm43xx_ilt.c | 15 ++++ bcm43xx_ilt.h | 1 bcm43xx_main.c | 37 +++++----- bcm43xx_phy.c | 195 ++++++++++++++++++++++++-------------------------------- bcm43xx_radio.c | 13 ++- bcm43xx_wx.c | 28 ++++---- 8 files changed, 269 insertions(+), 198 deletions(-) --- NEW FILE jwltest-bcm43xx-post-2_6_20.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h.orig 2007-03-06 17:13:23.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h 2007-03-06 17:14:32.000000000 -0500 @@ -333,7 +333,7 @@ #define BCM43xx_SBF_PS2 0x04000000 #define BCM43xx_SBF_NO_SSID_BCAST 0x08000000 #define BCM43xx_SBF_TIME_UPDATE 0x10000000 -#define BCM43xx_SBF_80000000 0x80000000 /*FIXME: fix name*/ +#define BCM43xx_SBF_MODE_G 0x80000000 /* Microcode */ #define BCM43xx_UCODE_REVISION 0x0000 @@ -503,8 +503,6 @@ struct bcm43xx_sprominfo { u8 et1macaddr[6]; u8 et0phyaddr:5; u8 et1phyaddr:5; - u8 et0mdcport:1; - u8 et1mdcport:1; u8 boardrev; u8 locale:4; u8 antennas_aphy:2; @@ -538,7 +536,7 @@ struct bcm43xx_lopair { struct bcm43xx_phyinfo { /* Hardware Data */ - u8 version; + u8 analog; u8 type; u8 rev; u16 antenna_diversity; @@ -766,6 +764,7 @@ struct bcm43xx_private { * This is currently always BCM43xx_BUSTYPE_PCI */ u8 bustype; + u64 dma_mask; u16 board_vendor; u16 board_type; --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h.orig 2006-11-29 16:57:37.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h 2007-03-06 17:14:32.000000000 -0500 @@ -27,6 +27,7 @@ extern const u16 bcm43xx_ilt_sigmasqr2[B void bcm43xx_ilt_write(struct bcm43xx_private *bcm, u16 offset, u16 val); +void bcm43xx_ilt_write32(struct bcm43xx_private *bcm, u16 offset, u32 val); u16 bcm43xx_ilt_read(struct bcm43xx_private *bcm, u16 offset); #endif /* BCM43xx_ILT_H_ */ --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_radio.c.orig 2006-11-29 16:57:37.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_radio.c 2007-03-06 17:14:32.000000000 -0500 @@ -1393,11 +1393,12 @@ u16 bcm43xx_radio_init2050(struct bcm43x backup[12] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT); // Initialization - if (phy->version == 0) { + if (phy->analog == 0) { bcm43xx_write16(bcm, 0x03E6, 0x0122); } else { - if (phy->version >= 2) - bcm43xx_write16(bcm, 0x03E6, 0x0040); + if (phy->analog >= 2) + bcm43xx_phy_write(bcm, 0x0003, (bcm43xx_phy_read(bcm, 0x0003) + & 0xFFBF) | 0x0040); bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, (bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT) | 0x2000)); } @@ -1405,7 +1406,7 @@ u16 bcm43xx_radio_init2050(struct bcm43x ret = bcm43xx_radio_calibrationvalue(bcm); if (phy->type == BCM43xx_PHYTYPE_B) - bcm43xx_radio_write16(bcm, 0x0078, 0x0003); + bcm43xx_radio_write16(bcm, 0x0078, 0x0026); bcm43xx_phy_write(bcm, 0x0015, 0xBFAF); bcm43xx_phy_write(bcm, 0x002B, 0x1403); @@ -1416,7 +1417,7 @@ u16 bcm43xx_radio_init2050(struct bcm43x (bcm43xx_radio_read16(bcm, 0x0051) | 0x0004)); bcm43xx_radio_write16(bcm, 0x0052, 0x0000); bcm43xx_radio_write16(bcm, 0x0043, - bcm43xx_radio_read16(bcm, 0x0043) | 0x0009); + (bcm43xx_radio_read16(bcm, 0x0043) & 0xFFF0) | 0x0009); bcm43xx_phy_write(bcm, 0x0058, 0x0000); for (i = 0; i < 16; i++) { @@ -1488,7 +1489,7 @@ u16 bcm43xx_radio_init2050(struct bcm43x bcm43xx_phy_write(bcm, 0x0059, backup[17]); bcm43xx_phy_write(bcm, 0x0058, backup[18]); bcm43xx_write16(bcm, 0x03E6, backup[11]); - if (phy->version != 0) + if (phy->analog != 0) bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, backup[12]); bcm43xx_phy_write(bcm, 0x0035, backup[10]); bcm43xx_radio_selectchannel(bcm, radio->channel, 1); --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c.orig 2007-03-06 17:13:23.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c 2007-03-06 17:14:32.000000000 -0500 @@ -261,22 +261,22 @@ static int bcm43xx_wx_get_rangeparams(st if (phy->type == BCM43xx_PHYTYPE_A || phy->type == BCM43xx_PHYTYPE_G) { range->num_bitrates = 8; - range->bitrate[i++] = IEEE80211_OFDM_RATE_6MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_9MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_12MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_18MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_24MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_36MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_48MB; - range->bitrate[i++] = IEEE80211_OFDM_RATE_54MB; + range->bitrate[i++] = IEEE80211_OFDM_RATE_6MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_9MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_12MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_18MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_24MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_36MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_48MB * 500000; + range->bitrate[i++] = IEEE80211_OFDM_RATE_54MB * 500000; } if (phy->type == BCM43xx_PHYTYPE_B || phy->type == BCM43xx_PHYTYPE_G) { range->num_bitrates += 4; - range->bitrate[i++] = IEEE80211_CCK_RATE_1MB; - range->bitrate[i++] = IEEE80211_CCK_RATE_2MB; - range->bitrate[i++] = IEEE80211_CCK_RATE_5MB; - range->bitrate[i++] = IEEE80211_CCK_RATE_11MB; + range->bitrate[i++] = IEEE80211_CCK_RATE_1MB * 500000; + range->bitrate[i++] = IEEE80211_CCK_RATE_2MB * 500000; + range->bitrate[i++] = IEEE80211_CCK_RATE_5MB * 500000; + range->bitrate[i++] = IEEE80211_CCK_RATE_11MB * 500000; } geo = ieee80211_get_geo(bcm->ieee); @@ -286,7 +286,7 @@ static int bcm43xx_wx_get_rangeparams(st if (j == IW_MAX_FREQUENCIES) break; range->freq[j].i = j + 1; - range->freq[j].m = geo->a[i].freq;//FIXME? + range->freq[j].m = geo->a[i].freq * 100000; range->freq[j].e = 1; j++; } @@ -294,7 +294,7 @@ static int bcm43xx_wx_get_rangeparams(st if (j == IW_MAX_FREQUENCIES) break; range->freq[j].i = j + 1; - range->freq[j].m = geo->bg[i].freq;//FIXME? + range->freq[j].m = geo->bg[i].freq * 100000; range->freq[j].e = 1; j++; } --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c.orig 2006-11-29 16:57:37.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c 2007-03-06 17:14:32.000000000 -0500 @@ -325,6 +325,21 @@ void bcm43xx_ilt_write(struct bcm43xx_pr } } +void bcm43xx_ilt_write32(struct bcm43xx_private *bcm, u16 offset, u32 val) +{ + if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) { + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, offset); + mmiowb(); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA2, (val & 0xFFFF0000) >> 16); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, val & 0x0000FFFF); + } else { + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_CTRL, offset); + mmiowb(); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA2, (val & 0xFFFF0000) >> 16); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA1, val & 0x0000FFFF); + } +} + u16 bcm43xx_ilt_read(struct bcm43xx_private *bcm, u16 offset) { if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) { --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_dma.c.orig 2006-11-29 16:57:37.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_dma.c 2007-03-06 17:14:32.000000000 -0500 @@ -145,16 +145,14 @@ dma_addr_t map_descbuffer(struct bcm43xx int tx) { dma_addr_t dmaaddr; + int direction = PCI_DMA_FROMDEVICE; - if (tx) { - dmaaddr = dma_map_single(&ring->bcm->pci_dev->dev, - buf, len, - DMA_TO_DEVICE); - } else { - dmaaddr = dma_map_single(&ring->bcm->pci_dev->dev, + if (tx) + direction = PCI_DMA_TODEVICE; + + dmaaddr = pci_map_single(ring->bcm->pci_dev, buf, len, - DMA_FROM_DEVICE); - } + direction); return dmaaddr; } @@ -166,13 +164,13 @@ void unmap_descbuffer(struct bcm43xx_dma int tx) { if (tx) { - dma_unmap_single(&ring->bcm->pci_dev->dev, + pci_unmap_single(ring->bcm->pci_dev, addr, len, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); } else { - dma_unmap_single(&ring->bcm->pci_dev->dev, + pci_unmap_single(ring->bcm->pci_dev, addr, len, - DMA_FROM_DEVICE); + PCI_DMA_FROMDEVICE); } } @@ -183,8 +181,8 @@ void sync_descbuffer_for_cpu(struct bcm4 { assert(!ring->tx); - dma_sync_single_for_cpu(&ring->bcm->pci_dev->dev, - addr, len, DMA_FROM_DEVICE); + pci_dma_sync_single_for_cpu(ring->bcm->pci_dev, + addr, len, PCI_DMA_FROMDEVICE); } static inline @@ -194,8 +192,8 @@ void sync_descbuffer_for_device(struct b { assert(!ring->tx); - dma_sync_single_for_device(&ring->bcm->pci_dev->dev, - addr, len, DMA_FROM_DEVICE); + pci_dma_sync_single_for_cpu(ring->bcm->pci_dev, + addr, len, PCI_DMA_TODEVICE); } /* Unmap and free a descriptor buffer. */ @@ -214,17 +212,53 @@ void free_descriptor_buffer(struct bcm43 static int alloc_ringmemory(struct bcm43xx_dmaring *ring) { - struct device *dev = &(ring->bcm->pci_dev->dev); - - ring->descbase = dma_alloc_coherent(dev, BCM43xx_DMA_RINGMEMSIZE, - &(ring->dmabase), GFP_KERNEL); + ring->descbase = pci_alloc_consistent(ring->bcm->pci_dev, BCM43xx_DMA_RINGMEMSIZE, + &(ring->dmabase)); if (!ring->descbase) { - printk(KERN_ERR PFX "DMA ringmemory allocation failed\n"); - return -ENOMEM; + /* Allocation may have failed due to pci_alloc_consistent + insisting on use of GFP_DMA, which is more restrictive + than necessary... */ + struct dma_desc *rx_ring; + dma_addr_t rx_ring_dma; + + rx_ring = kzalloc(BCM43xx_DMA_RINGMEMSIZE, GFP_KERNEL); + if (!rx_ring) + goto out_err; + + rx_ring_dma = pci_map_single(ring->bcm->pci_dev, rx_ring, + BCM43xx_DMA_RINGMEMSIZE, + PCI_DMA_BIDIRECTIONAL); + + if (pci_dma_mapping_error(rx_ring_dma) || + rx_ring_dma + BCM43xx_DMA_RINGMEMSIZE > ring->bcm->dma_mask) { + /* Sigh... */ + if (!pci_dma_mapping_error(rx_ring_dma)) + pci_unmap_single(ring->bcm->pci_dev, + rx_ring_dma, BCM43xx_DMA_RINGMEMSIZE, + PCI_DMA_BIDIRECTIONAL); + rx_ring_dma = pci_map_single(ring->bcm->pci_dev, + rx_ring, BCM43xx_DMA_RINGMEMSIZE, + PCI_DMA_BIDIRECTIONAL); + if (pci_dma_mapping_error(rx_ring_dma) || + rx_ring_dma + BCM43xx_DMA_RINGMEMSIZE > ring->bcm->dma_mask) { + assert(0); + if (!pci_dma_mapping_error(rx_ring_dma)) + pci_unmap_single(ring->bcm->pci_dev, + rx_ring_dma, BCM43xx_DMA_RINGMEMSIZE, + PCI_DMA_BIDIRECTIONAL); + goto out_err; + } + } + + ring->descbase = rx_ring; + ring->dmabase = rx_ring_dma; } memset(ring->descbase, 0, BCM43xx_DMA_RINGMEMSIZE); return 0; +out_err: + printk(KERN_ERR PFX "DMA ringmemory allocation failed\n"); + return -ENOMEM; } static void free_ringmemory(struct bcm43xx_dmaring *ring) @@ -407,6 +441,29 @@ static int setup_rx_descbuffer(struct bc if (unlikely(!skb)) return -ENOMEM; dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0); + /* This hardware bug work-around adapted from the b44 driver. + The chip may be unable to do PCI DMA to/from anything above 1GB */ + if (pci_dma_mapping_error(dmaaddr) || + dmaaddr + ring->rx_buffersize > ring->bcm->dma_mask) { + /* This one has 30-bit addressing... */ + if (!pci_dma_mapping_error(dmaaddr)) + pci_unmap_single(ring->bcm->pci_dev, + dmaaddr, ring->rx_buffersize, + PCI_DMA_FROMDEVICE); + dev_kfree_skb_any(skb); + skb = __dev_alloc_skb(ring->rx_buffersize,GFP_DMA); + if (skb == NULL) + return -ENOMEM; + dmaaddr = pci_map_single(ring->bcm->pci_dev, + skb->data, ring->rx_buffersize, + PCI_DMA_FROMDEVICE); + if (pci_dma_mapping_error(dmaaddr) || + dmaaddr + ring->rx_buffersize > ring->bcm->dma_mask) { + assert(0); + dev_kfree_skb_any(skb); + return -ENOMEM; + } + } meta->skb = skb; meta->dmaaddr = dmaaddr; skb->dev = ring->bcm->net_dev; @@ -636,8 +693,10 @@ struct bcm43xx_dmaring * bcm43xx_setup_d err = dmacontroller_setup(ring); if (err) goto err_free_ringmemory; + return ring; out: + printk(KERN_ERR PFX "Error in bcm43xx_setup_dmaring\n"); return ring; err_free_ringmemory: @@ -705,30 +764,16 @@ int bcm43xx_dma_init(struct bcm43xx_priv struct bcm43xx_dmaring *ring; int err = -ENOMEM; int dma64 = 0; - u64 mask = bcm43xx_get_supported_dma_mask(bcm); - int nobits; - if (mask == DMA_64BIT_MASK) { + bcm->dma_mask = bcm43xx_get_supported_dma_mask(bcm); + if (bcm->dma_mask == DMA_64BIT_MASK) dma64 = 1; - nobits = 64; - } else if (mask == DMA_32BIT_MASK) - nobits = 32; - else - nobits = 30; - err = pci_set_dma_mask(bcm->pci_dev, mask); - err |= pci_set_consistent_dma_mask(bcm->pci_dev, mask); - if (err) { -#ifdef CONFIG_BCM43XX_PIO - printk(KERN_WARNING PFX "DMA not supported on this device." - " Falling back to PIO.\n"); - bcm->__using_pio = 1; - return -ENOSYS; -#else - printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. " - "Please recompile the driver with PIO support.\n"); - return -ENODEV; -#endif /* CONFIG_BCM43XX_PIO */ - } + err = pci_set_dma_mask(bcm->pci_dev, bcm->dma_mask); + if (err) + goto no_dma; + err = pci_set_consistent_dma_mask(bcm->pci_dev, bcm->dma_mask); + if (err) + goto no_dma; /* setup TX DMA channels. */ ring = bcm43xx_setup_dmaring(bcm, 0, 1, dma64); @@ -774,7 +819,9 @@ int bcm43xx_dma_init(struct bcm43xx_priv dma->rx_ring3 = ring; } - dprintk(KERN_INFO PFX "%d-bit DMA initialized\n", nobits); + dprintk(KERN_INFO PFX "%d-bit DMA initialized\n", + (bcm->dma_mask == DMA_64BIT_MASK) ? 64 : + (bcm->dma_mask == DMA_32BIT_MASK) ? 32 : 30); err = 0; out: return err; @@ -800,7 +847,17 @@ err_destroy_tx1: err_destroy_tx0: bcm43xx_destroy_dmaring(dma->tx_ring0); dma->tx_ring0 = NULL; - goto out; +no_dma: +#ifdef CONFIG_BCM43XX_PIO + printk(KERN_WARNING PFX "DMA not supported on this device." + " Falling back to PIO.\n"); + bcm->__using_pio = 1; + return -ENOSYS; +#else + printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. " + "Please recompile the driver with PIO support.\n"); + return -ENODEV; +#endif /* CONFIG_BCM43XX_PIO */ } /* Generate a cookie for the TX header. */ @@ -905,6 +962,7 @@ static void dma_tx_fragment(struct bcm43 struct bcm43xx_dmadesc_generic *desc; struct bcm43xx_dmadesc_meta *meta; dma_addr_t dmaaddr; + struct sk_buff *bounce_skb; assert(skb_shinfo(skb)->nr_frags == 0); @@ -924,9 +982,28 @@ static void dma_tx_fragment(struct bcm43 skb->len - sizeof(struct bcm43xx_txhdr), (cur_frag == 0), generate_cookie(ring, slot)); + dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); + if (dma_mapping_error(dmaaddr) || dmaaddr + skb->len > ring->bcm->dma_mask) { + /* chip cannot handle DMA to/from > 1GB, use bounce buffer (copied from b44 driver) */ + if (!dma_mapping_error(dmaaddr)) + unmap_descbuffer(ring, dmaaddr, skb->len, 1); + bounce_skb = __dev_alloc_skb(skb->len, GFP_ATOMIC|GFP_DMA); + if (!bounce_skb) + return; + dmaaddr = map_descbuffer(ring, bounce_skb->data, bounce_skb->len, 1); + if (dma_mapping_error(dmaaddr) || dmaaddr + skb->len > ring->bcm->dma_mask) { + if (!dma_mapping_error(dmaaddr)) + unmap_descbuffer(ring, dmaaddr, skb->len, 1); + dev_kfree_skb_any(bounce_skb); + assert(0); + return; + } + memcpy(skb_put(bounce_skb, skb->len), skb->data, skb->len); + dev_kfree_skb_any(skb); + skb = bounce_skb; + } meta->skb = skb; - dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); meta->dmaaddr = dmaaddr; fill_descriptor(ring, desc, dmaaddr, --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig 2007-03-06 17:13:23.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2007-03-06 17:14:32.000000000 -0500 @@ -95,13 +95,9 @@ static int modparam_noleds; module_param_named(noleds, modparam_noleds, int, 0444); MODULE_PARM_DESC(noleds, "Turn off all LED activity"); -#ifdef CONFIG_BCM43XX_DEBUG static char modparam_fwpostfix[64]; module_param_string(fwpostfix, modparam_fwpostfix, 64, 0444); -MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for debugging."); -#else -# define modparam_fwpostfix "" -#endif /* CONFIG_BCM43XX_DEBUG*/ +MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for using multiple firmware image versions."); /* If you want to debug with just a single device, enable this, @@ -855,8 +851,6 @@ static int bcm43xx_sprom_extract(struct value = sprom[BCM43xx_SPROM_ETHPHY]; bcm->sprom.et0phyaddr = (value & 0x001F); bcm->sprom.et1phyaddr = (value & 0x03E0) >> 5; - bcm->sprom.et0mdcport = (value & (1 << 14)) >> 14; - bcm->sprom.et1mdcport = (value & (1 << 15)) >> 15; /* boardrev, antennas, locale */ value = sprom[BCM43xx_SPROM_BOARDREV]; @@ -2978,8 +2972,10 @@ static int bcm43xx_chipset_attach(struct err = bcm43xx_pctl_set_crystal(bcm, 1); if (err) goto out; - bcm43xx_pci_read_config16(bcm, PCI_STATUS, &pci_status); - bcm43xx_pci_write_config16(bcm, PCI_STATUS, pci_status & ~PCI_STATUS_SIG_TARGET_ABORT); + err = bcm43xx_pci_read_config16(bcm, PCI_STATUS, &pci_status); + if (err) + goto out; + err = bcm43xx_pci_write_config16(bcm, PCI_STATUS, pci_status & ~PCI_STATUS_SIG_TARGET_ABORT); out: return err; @@ -3677,7 +3673,7 @@ static int bcm43xx_read_phyinfo(struct b { struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm); u16 value; - u8 phy_version; + u8 phy_analog; u8 phy_type; u8 phy_rev; int phy_rev_ok = 1; @@ -3685,12 +3681,12 @@ static int bcm43xx_read_phyinfo(struct b value = bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_VER); - phy_version = (value & 0xF000) >> 12; + phy_analog = (value & 0xF000) >> 12; phy_type = (value & 0x0F00) >> 8; phy_rev = (value & 0x000F); - dprintk(KERN_INFO PFX "Detected PHY: Version: %x, Type %x, Revision %x\n", - phy_version, phy_type, phy_rev); + dprintk(KERN_INFO PFX "Detected PHY: Analog: %x, Type %x, Revision %x\n", + phy_analog, phy_type, phy_rev); switch (phy_type) { case BCM43xx_PHYTYPE_A: @@ -3733,7 +3729,7 @@ static int bcm43xx_read_phyinfo(struct b phy_rev); } - phy->version = phy_version; + phy->analog = phy_analog; phy->type = phy_type; phy->rev = phy_rev; if ((phy_type == BCM43xx_PHYTYPE_B) || (phy_type == BCM43xx_PHYTYPE_G)) { @@ -3775,12 +3771,18 @@ static int bcm43xx_attach_board(struct b } net_dev->base_addr = (unsigned long)bcm->mmio_addr; - bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_VENDOR_ID, + err = bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_VENDOR_ID, &bcm->board_vendor); - bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_ID, + if (err) + goto err_iounmap; + err = bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_ID, &bcm->board_type); - bcm43xx_pci_read_config16(bcm, PCI_REVISION_ID, + if (err) + goto err_iounmap; + err = bcm43xx_pci_read_config16(bcm, PCI_REVISION_ID, &bcm->board_revision); + if (err) + goto err_iounmap; err = bcm43xx_chipset_attach(bcm); if (err) @@ -3871,6 +3873,7 @@ err_pci_release: pci_release_regions(pci_dev); err_pci_disable: pci_disable_device(pci_dev); + printk(KERN_ERR PFX "Unable to attach board\n"); goto out; } --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c.orig 2006-11-29 16:57:37.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c 2007-03-06 17:14:32.000000000 -0500 @@ -205,8 +205,8 @@ static void bcm43xx_phy_init_pctl(struct (bcm->board_type == 0x0416)) return; - bcm43xx_write16(bcm, 0x03E6, bcm43xx_read16(bcm, 0x03E6) & 0xFFDF); bcm43xx_phy_write(bcm, 0x0028, 0x8018); + bcm43xx_write16(bcm, 0x03E6, bcm43xx_read16(bcm, 0x03E6) & 0xFFDF); if (phy->type == BCM43xx_PHYTYPE_G) { if (!phy->connected) @@ -317,6 +317,13 @@ static void bcm43xx_phy_agcsetup(struct bcm43xx_ilt_write(bcm, offset + 0x0801, 7); bcm43xx_ilt_write(bcm, offset + 0x0802, 16); bcm43xx_ilt_write(bcm, offset + 0x0803, 28); + + if (phy->rev >= 6) { + bcm43xx_phy_write(bcm, 0x0426, (bcm43xx_phy_read(bcm, 0x0426) + & 0xFFFC)); + bcm43xx_phy_write(bcm, 0x0426, (bcm43xx_phy_read(bcm, 0x0426) + & 0xEFFF)); + } } static void bcm43xx_phy_setupg(struct bcm43xx_private *bcm) @@ -337,7 +344,7 @@ static void bcm43xx_phy_setupg(struct bc for (i = 0; i < BCM43xx_ILT_NOISEG1_SIZE; i++) bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noiseg1[i]); for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++) - bcm43xx_ilt_write(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]); + bcm43xx_ilt_write32(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]); } else { /* nrssi values are signed 6-bit values. Not sure why we write 0x7654 here... */ bcm43xx_nrssi_hw_write(bcm, 0xBA98, (s16)0x7654); @@ -377,7 +384,7 @@ static void bcm43xx_phy_setupg(struct bc if (phy->rev == 1) { for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++) - bcm43xx_ilt_write(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]); + bcm43xx_ilt_write32(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]); for (i = 0; i < 4; i++) { bcm43xx_ilt_write(bcm, 0x5404 + i, 0x0020); bcm43xx_ilt_write(bcm, 0x5408 + i, 0x0020); @@ -500,10 +507,10 @@ static void bcm43xx_phy_setupa(struct bc for (i = 0; i < BCM43xx_ILT_NOISEA2_SIZE; i++) bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noisea2[i]); for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++) - bcm43xx_ilt_write(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]); + bcm43xx_ilt_write32(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]); bcm43xx_phy_init_noisescaletbl(bcm); for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++) - bcm43xx_ilt_write(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]); + bcm43xx_ilt_write32(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]); break; case 3: for (i = 0; i < 64; i++) @@ -729,19 +736,19 @@ static void bcm43xx_phy_initb5(struct bc struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm); struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm); u16 offset; + u16 value; + u8 old_channel; - if (phy->version == 1 && - radio->version == 0x2050) { + if (phy->analog == 1) bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0050); - } if ((bcm->board_vendor != PCI_VENDOR_ID_BROADCOM) && (bcm->board_type != 0x0416)) { + value = 0x2120; for (offset = 0x00A8 ; offset < 0x00C7; offset++) { - bcm43xx_phy_write(bcm, offset, - (bcm43xx_phy_read(bcm, offset) + 0x2020) - & 0x3F3F); + bcm43xx_phy_write(bcm, offset, value); + value += 0x0202; } } bcm43xx_phy_write(bcm, 0x0035, @@ -750,7 +757,7 @@ static void bcm43xx_phy_initb5(struct bc if (radio->version == 0x2050) bcm43xx_phy_write(bcm, 0x0038, 0x0667); - if (phy->connected) { + if (phy->type == BCM43xx_PHYTYPE_G) { if (radio->version == 0x2050) { bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) @@ -776,7 +783,7 @@ static void bcm43xx_phy_initb5(struct bc bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD) | (1 << 11)); } - if (phy->version == 1 && radio->version == 0x2050) { + if (phy->analog == 1) { bcm43xx_phy_write(bcm, 0x0026, 0xCE00); bcm43xx_phy_write(bcm, 0x0021, 0x3763); bcm43xx_phy_write(bcm, 0x0022, 0x1BC3); @@ -787,14 +794,15 @@ static void bcm43xx_phy_initb5(struct bc bcm43xx_phy_write(bcm, 0x0030, 0x00C6); bcm43xx_write16(bcm, 0x03EC, 0x3F22); - if (phy->version == 1 && radio->version == 0x2050) + if (phy->analog == 1) bcm43xx_phy_write(bcm, 0x0020, 0x3E1C); else bcm43xx_phy_write(bcm, 0x0020, 0x301C); - if (phy->version == 0) + if (phy->analog == 0) bcm43xx_write16(bcm, 0x03E4, 0x3000); + old_channel = radio->channel; /* Force to channel 7, even if not supported. */ bcm43xx_radio_selectchannel(bcm, 7, 0); @@ -816,11 +824,11 @@ static void bcm43xx_phy_initb5(struct bc bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0007); - bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0); + bcm43xx_radio_selectchannel(bcm, old_channel, 0); bcm43xx_phy_write(bcm, 0x0014, 0x0080); bcm43xx_phy_write(bcm, 0x0032, 0x00CA); - bcm43xx_phy_write(bcm, 0x88A3, 0x002A); + bcm43xx_phy_write(bcm, 0x002A, 0x88A3); bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF); @@ -835,61 +843,24 @@ static void bcm43xx_phy_initb6(struct bc struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm); struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm); u16 offset, val; + u8 old_channel; bcm43xx_phy_write(bcm, 0x003E, 0x817A); bcm43xx_radio_write16(bcm, 0x007A, (bcm43xx_radio_read16(bcm, 0x007A) | 0x0058)); - if ((radio->manufact == 0x17F) && - (radio->version == 0x2050) && - (radio->revision == 3 || - radio->revision == 4 || - radio->revision == 5)) { - bcm43xx_radio_write16(bcm, 0x0051, 0x001F); - bcm43xx_radio_write16(bcm, 0x0052, 0x0040); - bcm43xx_radio_write16(bcm, 0x0053, 0x005B); - bcm43xx_radio_write16(bcm, 0x0054, 0x0098); + if (radio->revision == 4 || + radio->revision == 5) { + bcm43xx_radio_write16(bcm, 0x0051, 0x0037); + bcm43xx_radio_write16(bcm, 0x0052, 0x0070); + bcm43xx_radio_write16(bcm, 0x0053, 0x00B3); + bcm43xx_radio_write16(bcm, 0x0054, 0x009B); bcm43xx_radio_write16(bcm, 0x005A, 0x0088); bcm43xx_radio_write16(bcm, 0x005B, 0x0088); bcm43xx_radio_write16(bcm, 0x005D, 0x0088); bcm43xx_radio_write16(bcm, 0x005E, 0x0088); bcm43xx_radio_write16(bcm, 0x007D, 0x0088); } - if ((radio->manufact == 0x17F) && - (radio->version == 0x2050) && - (radio->revision == 6)) { - bcm43xx_radio_write16(bcm, 0x0051, 0x0000); - bcm43xx_radio_write16(bcm, 0x0052, 0x0040); - bcm43xx_radio_write16(bcm, 0x0053, 0x00B7); - bcm43xx_radio_write16(bcm, 0x0054, 0x0098); - bcm43xx_radio_write16(bcm, 0x005A, 0x0088); - bcm43xx_radio_write16(bcm, 0x005B, 0x008B); - bcm43xx_radio_write16(bcm, 0x005C, 0x00B5); - bcm43xx_radio_write16(bcm, 0x005D, 0x0088); - bcm43xx_radio_write16(bcm, 0x005E, 0x0088); - bcm43xx_radio_write16(bcm, 0x007D, 0x0088); - bcm43xx_radio_write16(bcm, 0x007C, 0x0001); - bcm43xx_radio_write16(bcm, 0x007E, 0x0008); - } - if ((radio->manufact == 0x17F) && - (radio->version == 0x2050) && - (radio->revision == 7)) { - bcm43xx_radio_write16(bcm, 0x0051, 0x0000); - bcm43xx_radio_write16(bcm, 0x0052, 0x0040); - bcm43xx_radio_write16(bcm, 0x0053, 0x00B7); - bcm43xx_radio_write16(bcm, 0x0054, 0x0098); - bcm43xx_radio_write16(bcm, 0x005A, 0x0088); - bcm43xx_radio_write16(bcm, 0x005B, 0x00A8); - bcm43xx_radio_write16(bcm, 0x005C, 0x0075); - bcm43xx_radio_write16(bcm, 0x005D, 0x00F5); - bcm43xx_radio_write16(bcm, 0x005E, 0x00B8); - bcm43xx_radio_write16(bcm, 0x007D, 0x00E8); - bcm43xx_radio_write16(bcm, 0x007C, 0x0001); - bcm43xx_radio_write16(bcm, 0x007E, 0x0008); - bcm43xx_radio_write16(bcm, 0x007B, 0x0000); - } - if ((radio->manufact == 0x17F) && - (radio->version == 0x2050) && - (radio->revision == 8)) { + if (radio->revision == 8) { bcm43xx_radio_write16(bcm, 0x0051, 0x0000); bcm43xx_radio_write16(bcm, 0x0052, 0x0040); bcm43xx_radio_write16(bcm, 0x0053, 0x00B7); @@ -933,20 +904,26 @@ static void bcm43xx_phy_initb6(struct bc bcm43xx_phy_read(bcm, 0x0802) | 0x0100); bcm43xx_phy_write(bcm, 0x042B, bcm43xx_phy_read(bcm, 0x042B) | 0x2000); + bcm43xx_phy_write(bcm, 0x5B, 0x0000); + bcm43xx_phy_write(bcm, 0x5C, 0x0000); } - /* Force to channel 7, even if not supported. */ - bcm43xx_radio_selectchannel(bcm, 7, 0); + old_channel = radio->channel; + if (old_channel >= 8) + bcm43xx_radio_selectchannel(bcm, 1, 0); + else + bcm43xx_radio_selectchannel(bcm, 13, 0); bcm43xx_radio_write16(bcm, 0x0050, 0x0020); bcm43xx_radio_write16(bcm, 0x0050, 0x0023); udelay(40); - bcm43xx_radio_write16(bcm, 0x007C, (bcm43xx_radio_read16(bcm, 0x007C) | 0x0002)); - bcm43xx_radio_write16(bcm, 0x0050, 0x0020); - if (radio->manufact == 0x17F && - radio->version == 0x2050 && - radio->revision <= 2) { + if (radio->revision < 6 || radio-> revision == 8) { + bcm43xx_radio_write16(bcm, 0x007C, (bcm43xx_radio_read16(bcm, 0x007C) + | 0x0002)); bcm43xx_radio_write16(bcm, 0x0050, 0x0020); + } + if (radio->revision <= 2) { + bcm43xx_radio_write16(bcm, 0x007C, 0x0020); bcm43xx_radio_write16(bcm, 0x005A, 0x0070); bcm43xx_radio_write16(bcm, 0x005B, 0x007B); bcm43xx_radio_write16(bcm, 0x005C, 0x00B0); @@ -954,46 +931,41 @@ static void bcm43xx_phy_initb6(struct bc bcm43xx_radio_write16(bcm, 0x007A, (bcm43xx_radio_read16(bcm, 0x007A) & 0x00F8) | 0x0007); - bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0); + bcm43xx_radio_selectchannel(bcm, old_channel, 0); bcm43xx_phy_write(bcm, 0x0014, 0x0200); - if (radio->version == 0x2050){ - if (radio->revision == 3 || - radio->revision == 4 || - radio->revision == 5) - bcm43xx_phy_write(bcm, 0x002A, 0x8AC0); - else - bcm43xx_phy_write(bcm, 0x002A, 0x88C2); - } + if (radio->revision >= 6) + bcm43xx_phy_write(bcm, 0x002A, 0x88C2); + else + bcm43xx_phy_write(bcm, 0x002A, 0x8AC0); bcm43xx_phy_write(bcm, 0x0038, 0x0668); bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF); - if (radio->version == 0x2050) { - if (radio->revision == 3 || - radio->revision == 4 || - radio->revision == 5) - bcm43xx_phy_write(bcm, 0x005D, bcm43xx_phy_read(bcm, 0x005D) | 0x0003); - else if (radio->revision <= 2) - bcm43xx_radio_write16(bcm, 0x005D, 0x000D); - } + if (radio->revision <= 5) + bcm43xx_phy_write(bcm, 0x005D, bcm43xx_phy_read(bcm, 0x005D) | 0x0003); + if (radio->revision <= 2) + bcm43xx_radio_write16(bcm, 0x005D, 0x000D); - if (phy->rev == 4) - bcm43xx_phy_write(bcm, 0x0002, (bcm43xx_phy_read(bcm, 0x0002) & 0xFFC0) | 0x0004); - else + if (phy->analog == 4){ bcm43xx_write16(bcm, 0x03E4, 0x0009); + bcm43xx_phy_write(bcm, 0x61, bcm43xx_phy_read(bcm, 0x61) & 0xFFF); + } else { + bcm43xx_phy_write(bcm, 0x0002, (bcm43xx_phy_read(bcm, 0x0002) & 0xFFC0) | 0x0004); + } + if (phy->type == BCM43xx_PHYTYPE_G) + bcm43xx_write16(bcm, 0x03E6, 0x0); if (phy->type == BCM43xx_PHYTYPE_B) { bcm43xx_write16(bcm, 0x03E6, 0x8140); bcm43xx_phy_write(bcm, 0x0016, 0x0410); bcm43xx_phy_write(bcm, 0x0017, 0x0820); bcm43xx_phy_write(bcm, 0x0062, 0x0007); (void) bcm43xx_radio_calibrationvalue(bcm); - bcm43xx_phy_lo_b_measure(bcm); + bcm43xx_phy_lo_g_measure(bcm); if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) { bcm43xx_calc_nrssi_slope(bcm); bcm43xx_calc_nrssi_threshold(bcm); } bcm43xx_phy_init_pctl(bcm); - } else - bcm43xx_write16(bcm, 0x03E6, 0x0); + } } static void bcm43xx_calc_loopback_gain(struct bcm43xx_private *bcm) @@ -1063,7 +1035,7 @@ static void bcm43xx_calc_loopback_gain(s bcm43xx_phy_write(bcm, 0x005A, 0x0780); bcm43xx_phy_write(bcm, 0x0059, 0xC810); bcm43xx_phy_write(bcm, 0x0058, 0x000D); - if (phy->version == 0) { + if (phy->analog == 0) { bcm43xx_phy_write(bcm, 0x0003, 0x0122); } else { bcm43xx_phy_write(bcm, 0x000A, @@ -1205,27 +1177,30 @@ static void bcm43xx_phy_initg(struct bcm if (phy->rev >= 2) { bcm43xx_phy_write(bcm, 0x0814, 0x0000); bcm43xx_phy_write(bcm, 0x0815, 0x0000); - if (phy->rev == 2) - bcm43xx_phy_write(bcm, 0x0811, 0x0000); - else if (phy->rev >= 3) - bcm43xx_phy_write(bcm, 0x0811, 0x0400); + } + if (phy->rev == 2) { + bcm43xx_phy_write(bcm, 0x0811, 0x0000); bcm43xx_phy_write(bcm, 0x0015, 0x00C0); - if (phy->connected) { - tmp = bcm43xx_phy_read(bcm, 0x0400) & 0xFF; - if (tmp < 6) { - bcm43xx_phy_write(bcm, 0x04C2, 0x1816); - bcm43xx_phy_write(bcm, 0x04C3, 0x8006); - if (tmp != 3) { - bcm43xx_phy_write(bcm, 0x04CC, - (bcm43xx_phy_read(bcm, 0x04CC) - & 0x00FF) | 0x1F00); - } + } + if (phy->rev >= 3) { + bcm43xx_phy_write(bcm, 0x0811, 0x0400); + bcm43xx_phy_write(bcm, 0x0015, 0x00C0); + } + if (phy->connected) { + tmp = bcm43xx_phy_read(bcm, 0x0400) & 0xFF; + if (tmp < 6) { + bcm43xx_phy_write(bcm, 0x04C2, 0x1816); + bcm43xx_phy_write(bcm, 0x04C3, 0x8006); + if (tmp != 3) { + bcm43xx_phy_write(bcm, 0x04CC, + (bcm43xx_phy_read(bcm, 0x04CC) + & 0x00FF) | 0x1F00); } } } if (phy->rev < 3 && phy->connected) bcm43xx_phy_write(bcm, 0x047E, 0x0078); - if (phy->rev >= 6 && phy->rev <= 8) { + if (radio->revision == 8) { bcm43xx_phy_write(bcm, 0x0801, bcm43xx_phy_read(bcm, 0x0801) | 0x0080); bcm43xx_phy_write(bcm, 0x043E, bcm43xx_phy_read(bcm, 0x043E) | 0x0004); } @@ -1638,14 +1613,14 @@ void bcm43xx_phy_set_baseband_attenuatio struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm); u16 value; - if (phy->version == 0) { + if (phy->analog == 0) { value = (bcm43xx_read16(bcm, 0x03E6) & 0xFFF0); value |= (baseband_attenuation & 0x000F); bcm43xx_write16(bcm, 0x03E6, value); return; } - if (phy->version > 1) { + if (phy->analog > 1) { value = bcm43xx_phy_read(bcm, 0x0060) & ~0x003C; value |= (baseband_attenuation << 2) & 0x003C; } else { jwltest-bcm43xx-workqueue-undo.patch: bcm43xx.h | 2 +- bcm43xx_main.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) --- NEW FILE jwltest-bcm43xx-workqueue-undo.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h.orig 2007-02-14 17:43:25.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h 2007-02-14 17:44:27.000000000 -0500 @@ -818,7 +818,7 @@ struct bcm43xx_private { struct tasklet_struct isr_tasklet; /* Periodic tasks */ - struct delayed_work periodic_work; + struct work_struct periodic_work; unsigned int periodic_state; struct work_struct restart_work; --- linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig 2007-02-14 17:43:25.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2007-02-14 17:44:27.000000000 -0500 @@ -3212,10 +3212,9 @@ static void do_periodic_work(struct bcm4 schedule_delayed_work(&bcm->periodic_work, HZ * 15); } -static void bcm43xx_periodic_work_handler(struct work_struct *work) +static void bcm43xx_periodic_work_handler(void *d) { - struct bcm43xx_private *bcm = - container_of(work, struct bcm43xx_private, periodic_work.work); + struct bcm43xx_private *bcm = d; struct net_device *net_dev = bcm->net_dev; unsigned long flags; u32 savedirqs = 0; @@ -3277,11 +3276,11 @@ void bcm43xx_periodic_tasks_delete(struc void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm) { - struct delayed_work *work = &bcm->periodic_work; + struct work_struct *work = &(bcm->periodic_work); assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED); - INIT_DELAYED_WORK(work, bcm43xx_periodic_work_handler); - schedule_delayed_work(work, 0); + INIT_WORK(work, bcm43xx_periodic_work_handler, bcm); + schedule_work(work); } static void bcm43xx_security_init(struct bcm43xx_private *bcm) @@ -3633,7 +3632,7 @@ static int bcm43xx_init_board(struct bcm bcm43xx_periodic_tasks_setup(bcm); /*FIXME: This should be handled by softmac instead. */ - schedule_delayed_work(&bcm->softmac->associnfo.work, 0); + schedule_work(&bcm->softmac->associnfo.work); out: mutex_unlock(&(bcm)->mutex); @@ -4187,10 +4186,9 @@ static void __devexit bcm43xx_remove_one /* Hard-reset the chip. Do not call this directly. * Use bcm43xx_controller_restart() */ -static void bcm43xx_chip_reset(struct work_struct *work) +static void bcm43xx_chip_reset(void *_bcm) { - struct bcm43xx_private *bcm = - container_of(work, struct bcm43xx_private, restart_work); + struct bcm43xx_private *bcm = _bcm; struct bcm43xx_phyinfo *phy; int err = -ENODEV; @@ -4217,7 +4215,7 @@ void bcm43xx_controller_restart(struct b if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) return; printk(KERN_ERR PFX "Controller RESET (%s) ...\n", reason); - INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset); + INIT_WORK(&bcm->restart_work, bcm43xx_chip_reset, bcm); schedule_work(&bcm->restart_work); } jwltest-iwlwifi-2_6_19-fixup.patch: base.c | 128 +++++++++++++++++++++++++++++++------------------------------- iwlwifi.h | 14 +++--- 2 files changed, 71 insertions(+), 71 deletions(-) --- NEW FILE jwltest-iwlwifi-2_6_19-fixup.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-03-02 15:30:45.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-03-02 15:32:15.000000000 -0500 @@ -253,12 +253,12 @@ static void ipw_rx_queue_free(struct ipw static void ipw_rx_queue_replenish(struct ipw_priv *priv); static int ipw_up(struct ipw_priv *); -static void ipw_bg_up(struct work_struct *work); +static void ipw_bg_up(void *p); static void ipw_down(struct ipw_priv *); -static void ipw_bg_down(struct work_struct *work); +static void ipw_bg_down(void *p); static int ipw_card_show_info(struct ipw_priv *priv); -static void ipw_bg_alive_start(struct work_struct *work); +static void ipw_bg_alive_start(void *p); static int ipw_send_card_state(struct ipw_priv *priv, u32 flags, u8 meta_flag); static void ipw_link_down(struct ipw_priv *priv); @@ -1409,9 +1409,9 @@ static void ipw_setup_activity_timer(str IPW_ACTIVITY_PERIOD); } -static void ipw_bg_activity_timer(struct work_struct *work) +static void ipw_bg_activity_timer(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, activity_timer.work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -3378,9 +3378,9 @@ static void reg_txpower_periodic(struct &priv->thermal_periodic, REG_RECALIB_PERIOD * HZ); } -static void ipw_bg_reg_txpower_periodic(struct work_struct *work) +static void ipw_bg_reg_txpower_periodic(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, thermal_periodic.work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -3780,9 +3780,9 @@ static void ipw_connection_init_rx_confi #define IPW_SCAN_CHECK_WATCHDOG (7 * HZ) -static void ipw_bg_scan_check(struct work_struct *work) +static void ipw_bg_scan_check(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, scan_check.work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -4789,9 +4789,9 @@ static void ipw_init_geos(struct ipw_pri static int ipw_commit_rxon(struct ipw_priv *priv); -static void ipw_bg_post_associate(struct work_struct *work) +static void ipw_bg_post_associate(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, post_associate); + struct ipw_priv *priv = p; struct ieee80211_conf *conf = NULL; if (priv->status & STATUS_EXIT_PENDING) @@ -5077,9 +5077,9 @@ static void ipw_rx_queue_replenish(struc spin_unlock_irqrestore(&priv->lock, flags); } -static void ipw_bg_rx_queue_replenish(struct work_struct *work) +static void ipw_bg_rx_queue_replenish(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, rx_replenish); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -6391,9 +6391,9 @@ static u8 ipw_sync_station(struct ipw_pr return IPW_INVALID_STATION; } -static void ipw_bg_scan_completed(struct work_struct *work) +static void ipw_bg_scan_completed(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, scan_completed); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -6682,9 +6682,9 @@ static void ipw_gather_stats(struct ipw_ IPW_STATS_INTERVAL); } -static void ipw_bg_gather_stats(struct work_struct *work) +static void ipw_bg_gather_stats(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, gather_stats.work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -6922,7 +6922,7 @@ static int ipw_get_channels_for_scan(str return added; } -static void ipw_bg_request_scan(struct work_struct *work) +static void ipw_bg_request_scan(void *p) { struct ipw_host_cmd cmd = { @@ -6930,7 +6930,7 @@ static void ipw_bg_request_scan(struct w .len = sizeof(struct ipw_scan_cmd), .meta.flags = CMD_SIZE_HUGE, }; - struct ipw_priv *priv = container_of(work, struct ipw_priv, request_scan.work); + struct ipw_priv *priv = p; int rc = 0; struct ipw_scan_cmd *scan; struct ieee80211_hw_mode *hw_mode = NULL; @@ -7120,9 +7120,9 @@ static void ipw_bg_request_scan(struct w mutex_unlock(&priv->mutex); } -static void ipw_bg_abort_scan(struct work_struct *work) +static void ipw_bg_abort_scan(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, abort_scan); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -7257,18 +7257,18 @@ static void ipw_qos_activate(struct ipw_ */ } } -static void ipw_bg_qos_activate(struct work_struct *work) +static void ipw_bg_qos_activate(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, qos_activate); + struct ipw_priv *priv = p; mutex_lock(&priv->mutex); ipw_qos_activate(priv, 0); mutex_unlock(&priv->mutex); } -static void ipw_bg_report_work(struct work_struct *work) +static void ipw_bg_report_work(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, report_work); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -9480,9 +9480,9 @@ static irqreturn_t ipw_isr(int irq, void return IRQ_NONE; } -static void ipw_bg_rf_kill(struct work_struct *work) +static void ipw_bg_rf_kill(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, rf_kill); + struct ipw_priv *priv = p; wake_up_interruptible(&priv->wait_command_queue); @@ -9547,9 +9547,9 @@ static void ipw_link_up(struct ipw_priv ipw_scan_initiate(priv, 1000); } -static void ipw_bg_update_link_led(struct work_struct *work) +static void ipw_bg_update_link_led(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, update_link_led); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -9557,9 +9557,9 @@ static void ipw_bg_update_link_led(struc ipw_update_link_led(priv); mutex_unlock(&priv->mutex); } -static void ipw_bg_link_up(struct work_struct *work) +static void ipw_bg_link_up(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, link_up); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -9586,9 +9586,9 @@ static void ipw_link_down(struct ipw_pri return; } -static void ipw_bg_link_down(struct work_struct *work) +static void ipw_bg_link_down(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, link_down); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -9597,9 +9597,9 @@ static void ipw_bg_link_down(struct work mutex_unlock(&priv->mutex); } -static void ipw_bg_resume_work(struct work_struct *work) +static void ipw_bg_resume_work(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, resume_work.work); + struct ipw_priv *priv = p; unsigned long flags; mutex_lock(&priv->mutex); @@ -9651,9 +9651,9 @@ static void ipw_bg_resume_work(struct wo } #if 0 -static void ipw_associate_timeout(struct work_struct *work) +static void ipw_associate_timeout(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, associate_timeout.work); + struct ipw_priv *priv = p; mutex_lock(&priv->mutex); @@ -9698,32 +9698,32 @@ static void ipw_setup_deferred_work(stru init_waitqueue_head(&priv->wait_command_queue); - INIT_WORK(&priv->scan_completed, ipw_bg_scan_completed); - INIT_WORK(&priv->rx_replenish, ipw_bg_rx_queue_replenish); - INIT_WORK(&priv->rf_kill, ipw_bg_rf_kill); - INIT_WORK(&priv->up, ipw_bg_up); - INIT_WORK(&priv->down, ipw_bg_down); - INIT_WORK(&priv->abort_scan, ipw_bg_abort_scan); - INIT_WORK(&priv->link_up, ipw_bg_link_up); - INIT_WORK(&priv->update_link_led, ipw_bg_update_link_led); - INIT_WORK(&priv->link_down, ipw_bg_link_down); -// INIT_WORK(&priv->associate_timeout, ipw_associate_timeout); - - INIT_DELAYED_WORK(&priv->alive_start, ipw_bg_alive_start); - INIT_DELAYED_WORK(&priv->scan_check, ipw_bg_scan_check); - INIT_DELAYED_WORK(&priv->request_scan, ipw_bg_request_scan); - INIT_DELAYED_WORK(&priv->gather_stats, ipw_bg_gather_stats); - INIT_DELAYED_WORK(&priv->activity_timer, ipw_bg_activity_timer); - INIT_DELAYED_WORK(&priv->thermal_periodic, ipw_bg_reg_txpower_periodic); - INIT_DELAYED_WORK(&priv->resume_work, ipw_bg_resume_work); + INIT_WORK(&priv->scan_completed, ipw_bg_scan_completed, priv); + INIT_WORK(&priv->rx_replenish, ipw_bg_rx_queue_replenish, priv); + INIT_WORK(&priv->rf_kill, ipw_bg_rf_kill, priv); + INIT_WORK(&priv->up, ipw_bg_up, priv); + INIT_WORK(&priv->down, ipw_bg_down, priv); + INIT_WORK(&priv->abort_scan, ipw_bg_abort_scan, priv); + INIT_WORK(&priv->link_up, ipw_bg_link_up, priv); + INIT_WORK(&priv->update_link_led, ipw_bg_update_link_led, priv); + INIT_WORK(&priv->link_down, ipw_bg_link_down, priv); +// INIT_WORK(&priv->associate_timeout, ipw_associate_timeout, priv); + + INIT_WORK(&priv->alive_start, ipw_bg_alive_start, priv); + INIT_WORK(&priv->scan_check, ipw_bg_scan_check, priv); + INIT_WORK(&priv->request_scan, ipw_bg_request_scan, priv); + INIT_WORK(&priv->gather_stats, ipw_bg_gather_stats, priv); + INIT_WORK(&priv->activity_timer, ipw_bg_activity_timer, priv); + INIT_WORK(&priv->thermal_periodic, ipw_bg_reg_txpower_periodic, priv); + INIT_WORK(&priv->resume_work, ipw_bg_resume_work, priv); /* QoS */ - INIT_WORK(&priv->qos_activate, ipw_bg_qos_activate); + INIT_WORK(&priv->qos_activate, ipw_bg_qos_activate, priv); /* 802.11h */ - INIT_WORK(&priv->report_work, ipw_bg_report_work); + INIT_WORK(&priv->report_work, ipw_bg_report_work, priv); - INIT_WORK(&priv->post_associate, ipw_bg_post_associate); + INIT_WORK(&priv->post_associate, ipw_bg_post_associate, priv); init_timer(&priv->rate_scale_flush); priv->rate_scale_flush.data = (unsigned long)priv; @@ -9890,9 +9890,9 @@ static int ipw_card_remove_notify(struct * this function starts the calibration then start the process * of transfering the card to recieving state */ -static void ipw_bg_alive_start(struct work_struct *work) +static void ipw_bg_alive_start(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, alive_start.work); + struct ipw_priv *priv = p; int rc = 0; int thermal_spin = 0; @@ -10074,9 +10074,9 @@ static int ipw_up(struct ipw_priv *priv) return -EIO; } -static void ipw_bg_up(struct work_struct *work) +static void ipw_bg_up(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, up); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; @@ -10183,9 +10183,9 @@ static void ipw_down(struct ipw_priv *pr } -static void ipw_bg_down(struct work_struct *work) +static void ipw_bg_down(void *p) { - struct ipw_priv *priv = container_of(work, struct ipw_priv, down); + struct ipw_priv *priv = p; if (priv->status & STATUS_EXIT_PENDING) return; --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-03-02 15:30:45.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-03-02 15:32:15.000000000 -0500 @@ -1195,13 +1195,13 @@ struct ipw_priv { struct tasklet_struct irq_tasklet; - struct delayed_work alive_start; - struct delayed_work activity_timer; - struct delayed_work request_scan; - struct delayed_work thermal_periodic; - struct delayed_work gather_stats; - struct delayed_work scan_check; - struct delayed_work resume_work; + struct work_struct alive_start; + struct work_struct activity_timer; + struct work_struct request_scan; + struct work_struct thermal_periodic; + struct work_struct gather_stats; + struct work_struct scan_check; + struct work_struct resume_work; #define IPW_DEFAULT_TX_POWER 0x0F s8 user_txpower_limit; jwltest-iwlwifi.patch: Kconfig | 1 Makefile | 1 iwlwifi/Kconfig | 53 iwlwifi/Makefile | 2 iwlwifi/base.c |13165 +++++++++++++++++++++++++++++++++++++++++++++++++++ iwlwifi/iwlwifi.h | 1307 +++++ iwlwifi/iwlwifi_hw.h | 1875 +++++++ 7 files changed, 16404 insertions(+) --- NEW FILE jwltest-iwlwifi.patch --- --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-03-02 15:30:45.000000000 -0500 @@ -0,0 +1,13165 @@ +/****************************************************************************** + + Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. + + Portions of this file are derived from the ipw3945 project, as well + as portions of the ieee80211 subsystem header files. + + 802.11 status code portion of this file from ethereal-0.10.6: + Copyright 2000, Axis Communications AB + Ethereal - Network traffic analyzer + By Gerald Combs + Copyright 1998 Gerald Combs + + This program is free software; you can redistribute it and/or modify it + under the terms of version 2 of the GNU General Public License as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + + The full GNU General Public License is included in this distribution in the + file called LICENSE. + + Contact Information: + James P. Ketrenos + Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 + +******************************************************************************/ + +/* + * Theory of operation: + * + * The primary NIC mode of operation is configured within the RXON command. + * As such, there are two instances of RXON data -- staging_rxon and + * active_rxon. The former is used to configure the device, the later to + * reflect the actual currently active configuration. + * + * After configuring staging_rxon, it is activated by calling + * ipw_commit_rxon(). The ipw_commit_rxon() will ensure the correct sequence + * of commands are invoked on the hardware to result in Tx being possible + * (if the channel is appropriate for Tx) + * + * About the threading and lock model of the driver... + * + * There are three paths of execution through the driver. + * + * 1. ioctl based (wireless extensions, netdev, etc.) + * 2. interrupt based + * 3. scheduled work queue items + * + * As soon as an interrupt comes in, it schedules a tasklet. That tasklet, + * when run, does any HW checks, pulls any data from the read queue, + * and schedules other layers to do the actual work. + * + * NOTE: This driver is a work in progress. It is currently structured + * in a way that we can add support for the next wireless adapter + * available from Intel. + * + * Our current focus is as follows: + * 1. Get the driver working w/ mac80211 in STA(client) mode. + * 2. Clean up the dual-driver code from function redirection to + * if/else switches where the code detlas are minimal. + * 3. Evaluate the amount of delta between the hardware versions and + * possibly split iwlwifi into multiple drivers for each piece of + * HW, sharing as much base code as possible (would result in + * multiple driver files on disk vs. a single module that works + * with multiple hardware types) + * 4. Document the uCode regulatory enforcement + * 5. Document the rate scaling capabilities of the 3945 + * 6. Provide an initial rate scaling algorithm tailored for the + * statistic data exposed by the 3945. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//#define BIT(x) (1 << (x)) +#include +#include + +//#include +//#include +//#include +#include <../net/mac80211/ieee80211_rate.h> + +#include +#include + +#include "iwlwifi.h" + +#define IWLWIFI_VERSION "0.0.10k" + +#define DRV_DESCRIPTION "Intel(R) Wirless Link driver for Linux" +#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" +#define DRV_VERSION IWLWIFI_VERSION + +MODULE_DESCRIPTION(DRV_DESCRIPTION); +MODULE_VERSION(DRV_VERSION); +MODULE_AUTHOR(DRV_COPYRIGHT); +MODULE_LICENSE("GPL"); + +/*MAC80211 move this to mac80211 files */ +#define IEEE80211_FC(type, stype) cpu_to_le16((type << 2) | (stype << 4)) + +#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010 + +#define IEEE80211_24GHZ_BAND (1<<0) +#define IEEE80211_52GHZ_BAND (1<<1) + +#define IEEE80211_CCK_RATE_1MB 0x02 +#define IEEE80211_CCK_RATE_2MB 0x04 +#define IEEE80211_CCK_RATE_5MB 0x0B +#define IEEE80211_CCK_RATE_11MB 0x16 +#define IEEE80211_OFDM_RATE_6MB 0x0C +#define IEEE80211_OFDM_RATE_9MB 0x12 +#define IEEE80211_OFDM_RATE_12MB 0x18 +#define IEEE80211_OFDM_RATE_18MB 0x24 +#define IEEE80211_OFDM_RATE_24MB 0x30 +#define IEEE80211_OFDM_RATE_36MB 0x48 +#define IEEE80211_OFDM_RATE_48MB 0x60 +#define IEEE80211_OFDM_RATE_54MB 0x6C +#define IEEE80211_BASIC_RATE_MASK 0x80 + +#define IEEE80211_CCK_RATE_1MB_MASK (1<<0) +#define IEEE80211_CCK_RATE_2MB_MASK (1<<1) +#define IEEE80211_CCK_RATE_5MB_MASK (1<<2) +#define IEEE80211_CCK_RATE_11MB_MASK (1<<3) +#define IEEE80211_OFDM_RATE_6MB_MASK (1<<4) +#define IEEE80211_OFDM_RATE_9MB_MASK (1<<5) +#define IEEE80211_OFDM_RATE_12MB_MASK (1<<6) +#define IEEE80211_OFDM_RATE_18MB_MASK (1<<7) +#define IEEE80211_OFDM_RATE_24MB_MASK (1<<8) +#define IEEE80211_OFDM_RATE_36MB_MASK (1<<9) +#define IEEE80211_OFDM_RATE_48MB_MASK (1<<10) +#define IEEE80211_OFDM_RATE_54MB_MASK (1<<11) + +#define IEEE80211_CCK_RATES_MASK 0x0000000F +#define IEEE80211_CCK_BASIC_RATES_MASK (IEEE80211_CCK_RATE_1MB_MASK | \ + IEEE80211_CCK_RATE_2MB_MASK) +#define IEEE80211_CCK_DEFAULT_RATES_MASK (IEEE80211_CCK_BASIC_RATES_MASK | \ + IEEE80211_CCK_RATE_5MB_MASK | \ + IEEE80211_CCK_RATE_11MB_MASK) + +#define IEEE80211_OFDM_RATES_MASK 0x00000FF0 +#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \ + IEEE80211_OFDM_RATE_12MB_MASK | \ + IEEE80211_OFDM_RATE_24MB_MASK) +#define IEEE80211_OFDM_DEFAULT_RATES_MASK (IEEE80211_OFDM_BASIC_RATES_MASK | \ + IEEE80211_OFDM_RATE_9MB_MASK | \ + IEEE80211_OFDM_RATE_18MB_MASK | \ + IEEE80211_OFDM_RATE_36MB_MASK | \ + IEEE80211_OFDM_RATE_48MB_MASK | \ + IEEE80211_OFDM_RATE_54MB_MASK) +#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \ + IEEE80211_CCK_DEFAULT_RATES_MASK) + +#define IEEE80211_NUM_OFDM_RATES 8 +#define IEEE80211_NUM_CCK_RATES 4 +#define IEEE80211_OFDM_SHIFT_MASK_A 4 + +/*MAC80211 end */ + +static u32 ipw_debug_level; + +static int param_debug = 0; +static int param_channel = 0; +static int param_mode = 0; +static int param_auto_create = 1; /* def: create new adhoc network if needed */ +static int param_led = 1; /* def: use LEDs */ +static int param_disable = 0; /* def: enable radio */ +static int param_antenna = 0; /* def: 0 = both antennas (use diversity) */ +static int param_hwcrypto = 0; /* def: using software encryption */ +static int param_qos_enable = 1; + +static const char ipw_modes[] = { + 'a', 'b', 'g', '?' +}; + +#define LD_TIME_LINK_ON 300 + +static int ipw_power_init_handle(struct ipw_priv *priv); [...16032 lines suppressed...] + u8 flags; + /* We have 15 LSB to use as we please (MSB indicates + * a frame Rx'd from the HW). We encode the following + * information into the sequence field: + * + * 0:7 index in fifo + * 8:13 fifo selection + * 14:14 bit indicating if this packet references the 'extra' + * storage at the end of the memory queue + * 15:15 (Rx indication) + * + */ + u16 sequence; + + /* command data follows immediately */ + u8 data[0]; +} __attribute__ ((packed)); + +// Used for passing to driver number of successes and failures per rate +struct rate_histogram { + union { + u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; + u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; + u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; + } success; + union { + u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; + u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; + u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; + } failed; +} __attribute__ ((packed)); + +/* statistics command response */ + +struct statistics_rx_phy { + u32 ina_cnt; + u32 fina_cnt; + u32 plcp_err; + u32 crc32_err; + u32 overrun_err; + u32 early_overrun_err; + u32 crc32_good; + u32 false_alarm_cnt; + u32 fina_sync_err_cnt; + u32 sfd_timeout; + u32 fina_timeout; + u32 unresponded_rts; + u32 rxe_frame_limit_overrun; + u32 sent_ack_cnt; + u32 sent_cts_cnt; +} __attribute__ ((packed)); + +struct statistics_rx { + struct statistics_rx_phy ofdm; + struct statistics_rx_phy cck; + u32 bogus_cts; + u32 bogus_ack; + u32 non_bssid_frames; + u32 filtered_frames; + u32 non_channel_beacons; +} __attribute__ ((packed)); + +struct statistics_tx { + u32 preamble_cnt; + u32 rx_detected_cnt; + u32 bt_prio_defer_cnt; + u32 bt_prio_kill_cnt; + u32 few_bytes_cnt; + u32 cts_timeout; + u32 ack_timeout; + u32 expected_ack_cnt; + u32 actual_ack_cnt; +} __attribute__ ((packed)); + +struct statistics_dbg { + u32 burst_check; + u32 burst_count; + u32 reserved[4]; +} __attribute__ ((packed)); + +struct statistics_div { + u32 tx_on_a; + u32 tx_on_b; + u32 exec_time; + u32 probe_time; +} __attribute__ ((packed)); + +struct statistics_general { + u32 temperature; + struct statistics_dbg dbg; + u32 sleep_time; + u32 slots_out; + u32 slots_idle; + u32 ttl_timestamp; + struct statistics_div div; +} __attribute__ ((packed)); + +struct ipw_notif_statistics { + u32 flag; + struct statistics_rx rx; + struct statistics_tx tx; + struct statistics_general general; +} __attribute__ ((packed)); + +struct ipw_rx_packet { + u32 len; + struct ipw_cmd_header hdr; + union { + struct ipw_alive_resp alive_frame; + struct ipw_rx_frame rx_frame; + struct ipw_tx_resp tx_resp; + struct ipw_spectrum_notification spectrum_notif; + struct ipw_csa_notification csa_notif; + struct ipw_error_resp err_resp; + struct ipw_card_state_notif card_state_notif; + struct ipw_notif_statistics stats; + struct BeaconNtfSpecifics beacon_status; + struct ipw_add_sta_resp add_sta; + struct ipw_sleep_notification sleep_notif; + u32 status; + u8 raw[0]; + } u; +} __attribute__ ((packed)); + +#define IPW_RX_FRAME_SIZE (4 + sizeof(struct ipw_rx_frame)) + +struct ipw_multicast_addr { + u8 num_of_multicast_addresses; + u8 reserved[3]; + u8 mac1[6]; + u8 mac2[6]; + u8 mac3[6]; + u8 mac4[6]; +} __attribute__ ((packed)); + +struct ipw_tgi_tx_key { + u8 key_id; + u8 security_type; + u8 station_index; + u8 flags; + u8 key[16]; + u32 tx_counter[2]; +} __attribute__ ((packed)); + +struct ipw_associate { + u8 channel; + u8 auth_type:4, auth_key:4; + u8 assoc_type; + u8 reserved; + u16 policy_support; + u8 preamble_length; + u8 ieee_mode; + u8 bssid[ETH_ALEN]; + u32 assoc_tsf_msw; + u32 assoc_tsf_lsw; + u16 capability; + u16 listen_interval; + u16 beacon_interval; + u8 dest[ETH_ALEN]; + u16 atim_window; + u8 smr; + u8 reserved1; + u16 reserved2; + u16 assoc_id; + u8 erp_value; +} __attribute__ ((packed)); + +#define IPW_SUPPORTED_RATES_IE_LEN 8 + +struct ipw_supported_rates { + u8 ieee_mode; + u8 num_rates; + u8 purpose; + u8 reserved; + u8 supported_rates[IPW_MAX_RATES]; +} __attribute__ ((packed)); + +struct ipw_channel_tx_power { + u8 channel_number; + s8 tx_power; +} __attribute__ ((packed)); + + +#define IPW_RX_BUF_SIZE 3000 + +#endif /* __iwlwifi_hw_h__ */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-03-02 15:28:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/Makefile 2007-03-02 15:28:23.000000000 -0500 @@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211) += adm8211/ obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/ obj-$(CONFIG_RTL818X) += rtl818x/ +obj-$(CONFIG_IWLWIFI) += iwlwifi/ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-03-02 15:28:14.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/Kconfig 2007-03-02 15:28:23.000000000 -0500 @@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad source "drivers/net/wireless/mac80211/p54/Kconfig" source "drivers/net/wireless/mac80211/zd1211rw/Kconfig" source "drivers/net/wireless/mac80211/rtl818x/Kconfig" +source "drivers/net/wireless/mac80211/iwlwifi/Kconfig" jwltest-mac80211-backport-2_6_19-fixup.patch: drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 2 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 20 +-- drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 8 - drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 6 - drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 65 +++++------ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 6 - drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 14 +- drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 2 net/mac80211/ieee80211.c | 2 net/mac80211/ieee80211_i.h | 6 - net/mac80211/ieee80211_iface.c | 2 net/mac80211/ieee80211_sta.c | 12 -- net/mac80211/ieee80211_sysfs.c | 105 +++++++++---------- net/mac80211/ieee80211_sysfs_sta.c | 2 net/mac80211/sta_info.c | 7 - net/mac80211/wep.c | 1 net/mac80211/wme.c | 5 net/wireless/core.c | 4 net/wireless/nl80211.c | 3 26 files changed, 246 insertions(+), 304 deletions(-) --- NEW FILE jwltest-mac80211-backport-2_6_19-fixup.patch --- --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h 2007-03-02 16:16:05.000000000 -0500 @@ -742,7 +742,7 @@ struct bcm43xx_wldev { struct tasklet_struct isr_tasklet; /* Periodic tasks */ - struct delayed_work periodic_work; + struct work_struct periodic_work; unsigned int periodic_state; struct work_struct restart_work; --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c 2007-03-02 16:16:05.000000000 -0500 @@ -2284,10 +2284,9 @@ static int estimate_periodic_work_badnes return badness; } -static void bcm43xx_periodic_work_handler(struct work_struct *work) +static void bcm43xx_periodic_work_handler(void *d) { - struct bcm43xx_wldev *dev = - container_of(work, struct bcm43xx_wldev, periodic_work.work); + struct bcm43xx_wldev *dev = d; unsigned long flags; u32 savedirqs = 0; int badness; @@ -2336,12 +2335,12 @@ static void bcm43xx_periodic_tasks_delet static void bcm43xx_periodic_tasks_setup(struct bcm43xx_wldev *dev) { - struct delayed_work *work = &dev->periodic_work; + struct work_struct *work = &(dev->periodic_work); assert(bcm43xx_status(dev) == BCM43xx_STAT_INITIALIZED); dev->periodic_state = 0; - INIT_DELAYED_WORK(work, bcm43xx_periodic_work_handler); - schedule_delayed_work(work, 0); + INIT_WORK(work, bcm43xx_periodic_work_handler, dev); + schedule_work(work); } /* Validate access to the chip (SHM) */ @@ -3425,12 +3424,11 @@ static const struct ieee80211_ops bcm43x /* Hard-reset the chip. Do not call this directly. * Use bcm43xx_controller_restart() */ -static void bcm43xx_chip_reset(struct work_struct *work) +static void bcm43xx_chip_reset(void *d) { - struct bcm43xx_wldev *dev = - container_of(work, struct bcm43xx_wldev, restart_work); + struct bcm43xx_wldev *dev = d; struct bcm43xx_wl *wl = dev->wl; - int err; + int err = 0; int was_started = 0; int was_inited = 0; @@ -3630,7 +3628,7 @@ static int bcm43xx_wireless_core_attach( /* Now set some default "current_dev" */ if (!wl->current_dev) wl->current_dev = dev; - INIT_WORK(&dev->restart_work, bcm43xx_chip_reset); + INIT_WORK(&dev->restart_work, bcm43xx_chip_reset, dev); bcm43xx_radio_turn_off(dev); bcm43xx_switch_analog(dev, 0); --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h 2007-03-02 16:16:05.000000000 -0500 @@ -1226,9 +1226,9 @@ static void rt2500pci_disable_radio(stru /* * Interrupt functions. */ -static void rt2500pci_beacondone(struct work_struct *work); -static void rt2500pci_rxdone(struct work_struct *work); -static void rt2500pci_txdone(struct work_struct *work); +static void rt2500pci_beacondone(void *data); +static void rt2500pci_rxdone(void *data); +static void rt2500pci_txdone(void *data); static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance); #endif /* RT2500PCI_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c 2007-03-02 16:16:05.000000000 -0500 @@ -724,12 +724,9 @@ static void rt2500usb_config_mac_address /* * Link tuning */ -static void rt2500usb_link_tuner(struct work_struct *work) +static void rt2500usb_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u16 reg; u32 rssi; u8 reg_r17; @@ -905,7 +902,7 @@ static int rt2500usb_set_state(struct rt * Initialization functions. */ static int rt2500usb_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -915,7 +912,7 @@ static int rt2500usb_alloc_dma_ring(stru /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -1620,10 +1617,9 @@ static void rt2500usb_write_tx_desc(stru /* * Interrupt functions. */ -static void rt2500usb_beacondone(struct work_struct *work) +static void rt2500usb_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry(ring); struct sk_buff *skb; @@ -1638,10 +1634,9 @@ static void rt2500usb_beacondone(struct dev_kfree_skb_any(skb); } -static void rt2500usb_rxdone(struct work_struct *work) +static void rt2500usb_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -1724,10 +1719,9 @@ static void rt2500usb_rxdone(struct work rt2500usb_activity_led(rt2x00dev, 0); } -static void rt2500usb_txdone(struct work_struct *work) +static void rt2500usb_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct data_desc *txd; @@ -2145,13 +2139,11 @@ static void rt2500usb_set_multicast_list } } -static void rt2500usb_scan(struct work_struct *work) +static void rt2500usb_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2159,34 +2151,34 @@ static void rt2500usb_scan(struct work_s * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt2500usb_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt2500usb_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq, + rt2x00dev->scan->conf.scan_power_level); } else { rt2500usb_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt2500usb_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq, + rt2x00dev->scan->conf.scan_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2227,13 +2219,12 @@ static int rt2500usb_passive_scan(struct /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt2500usb_scan); + INIT_WORK(&rt2x00dev->scan->work, rt2500usb_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -2863,7 +2854,7 @@ static int rt2500usb_alloc_dev(struct us /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2500usb_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt2500usb_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h 2007-03-02 16:16:05.000000000 -0500 @@ -686,7 +686,7 @@ struct link { /* * Work structure for scheduling periodic link tuning. */ - struct delayed_work work; + struct work_struct work; }; static inline void rt2x00_start_link_tune(struct link *link) @@ -817,12 +817,6 @@ static inline void rt2x00_remove_interfa */ struct scanning { /* - * Pointer to main rt2x00dev structure where this - * scanning structure belongs to. - */ - struct rt2x00_dev *rt2x00dev; - - /* * Completion structure if an packet needs to be send. */ struct completion completion; --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h 2007-03-02 16:16:05.000000000 -0500 @@ -1390,9 +1390,9 @@ static void rt61pci_disable_radio(struct /* * Interrupt functions. */ -static void rt61pci_beacondone(struct work_struct *work); -static void rt61pci_rxdone(struct work_struct *work); -static void rt61pci_txdone(struct work_struct *work); +static void rt61pci_beacondone(void *data); +static void rt61pci_rxdone(void *data); +static void rt61pci_txdone(void *data); static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance); #endif /* RT61PCI_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c 2007-03-02 16:16:05.000000000 -0500 @@ -692,12 +692,9 @@ static void rt2500pci_config_mac_address /* * Link tuning */ -static void rt2500pci_link_tuner(struct work_struct *work) +static void rt2500pci_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u32 reg; u32 rssi; u8 reg_r17; @@ -851,7 +848,7 @@ static int rt2500pci_set_state(struct rt * Initialization functions. */ static int rt2500pci_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -860,7 +857,7 @@ static int rt2500pci_alloc_dma_ring(stru /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -1655,10 +1652,9 @@ static void rt2500pci_write_tx_desc(stru /* * Interrupt functions. */ -static void rt2500pci_beacondone(struct work_struct *work) +static void rt2500pci_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry(ring); struct sk_buff *skb; @@ -1673,10 +1669,9 @@ static void rt2500pci_beacondone(struct dev_kfree_skb_any(skb); } -static void rt2500pci_rxdone(struct work_struct *work) +static void rt2500pci_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -1741,10 +1736,9 @@ static void rt2500pci_rxdone(struct work rt2500pci_activity_led(rt2x00dev, 0); } -static void rt2500pci_txdone(struct work_struct *work) +static void rt2500pci_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct data_desc *txd; @@ -2207,13 +2201,11 @@ static void rt2500pci_set_multicast_list rt2x00dev->interface.promisc); } -static void rt2500pci_scan(struct work_struct *work) +static void rt2500pci_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2221,34 +2213,34 @@ static void rt2500pci_scan(struct work_s * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt2500pci_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt2500pci_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq, + rt2x00dev->scan->conf.scan_power_level); } else { rt2500pci_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt2500pci_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq, + rt2x00dev->scan->conf.scan_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2289,13 +2281,12 @@ static int rt2500pci_passive_scan(struct /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt2500pci_scan); + INIT_WORK(&rt2x00dev->scan->work, rt2500pci_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -3039,7 +3030,7 @@ static int rt2500pci_alloc_dev(struct pc /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2500pci_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt2500pci_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h 2007-03-02 16:16:05.000000000 -0500 @@ -731,9 +731,9 @@ static void rt2500usb_disable_radio(stru /* * Interrupt functions. */ -static void rt2500usb_beacondone(struct work_struct *work); -static void rt2500usb_rxdone(struct work_struct *work); -static void rt2500usb_txdone(struct work_struct *work); +static void rt2500usb_beacondone(void *data); +static void rt2500usb_rxdone(void *data); +static void rt2500usb_txdone(void *data); static void rt2500usb_interrupt(struct urb *urb); #endif /* RT2500USB_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c 2007-03-02 16:16:05.000000000 -0500 @@ -916,12 +916,9 @@ static void rt61pci_config_mac_address(s /* * Link tuning */ -static void rt61pci_link_tuner(struct work_struct *work) +static void rt61pci_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u32 reg; u32 rssi; u8 reg_r17; @@ -1267,7 +1264,7 @@ static int rt61pci_init_firmware(struct } static int rt61pci_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *work), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -1276,7 +1273,7 @@ static int rt61pci_alloc_dma_ring(struct /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -2115,10 +2112,9 @@ static void rt61pci_write_tx_desc(struct /* * Interrupt functions. */ -static void rt61pci_beacondone(struct work_struct *work) +static void rt61pci_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry(ring); struct sk_buff *skb; @@ -2133,10 +2129,9 @@ static void rt61pci_beacondone(struct wo dev_kfree_skb_any(skb); } -static void rt61pci_rxdone(struct work_struct *work) +static void rt61pci_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -2261,10 +2256,9 @@ static void rt61pci_txdone_entry(struct entry->tx_status.control.queue); } -static void rt61pci_txdone(struct work_struct *work) +static void rt61pci_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; int index; int reg; @@ -2691,13 +2685,11 @@ static void rt61pci_set_multicast_list(s rt2x00dev->interface.promisc); } -static void rt61pci_scan(struct work_struct *work) +static void rt61pci_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2705,34 +2697,34 @@ static void rt61pci_scan(struct work_str * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt61pci_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt61pci_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq, + rt2x00dev->scan->conf.scan_power_level); } else { rt61pci_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt61pci_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq, + rt2x00dev->scan->conf.scan_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2773,13 +2765,12 @@ static int rt61pci_passive_scan(struct i /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt61pci_scan); + INIT_WORK(&rt2x00dev->scan->work, rt61pci_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -3558,7 +3549,7 @@ static int rt61pci_alloc_dev(struct pci_ /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt61pci_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt61pci_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h 2007-03-02 16:16:05.000000000 -0500 @@ -972,9 +972,9 @@ static void rt73usb_disable_radio(struct /* * Interrupt functions. */ -static void rt73usb_beacondone(struct work_struct *work); -static void rt73usb_rxdone(struct work_struct *work); -static void rt73usb_txdone(struct work_struct *work); +static void rt73usb_beacondone(void *data); +static void rt73usb_rxdone(void *data); +static void rt73usb_txdone(void *data); static void rt73usb_interrupt(struct urb *urb); #endif /* RT73USB_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h 2007-03-02 16:16:05.000000000 -0500 @@ -959,9 +959,9 @@ static void rt2400pci_disable_radio(stru /* * Interrupt functions. */ -static void rt2400pci_beacondone(struct work_struct *work); -static void rt2400pci_rxdone(struct work_struct *work); -static void rt2400pci_txdone(struct work_struct *work); +static void rt2400pci_beacondone(void *data); +static void rt2400pci_rxdone(void *data); +static void rt2400pci_txdone(void *data); static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance); #endif /* RT2400PCI_H */ --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-03-02 16:16:05.000000000 -0500 @@ -814,12 +814,9 @@ static void rt73usb_config_mac_address(s /* * Link tuning */ -static void rt73usb_link_tuner(struct work_struct *work) +static void rt73usb_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u32 reg; u32 rssi; u8 reg_r17; @@ -1125,7 +1122,7 @@ static int rt73usb_init_firmware(struct } static int rt73usb_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *work), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -1135,7 +1132,7 @@ static int rt73usb_alloc_dma_ring(struct /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -1889,10 +1886,9 @@ static void rt73usb_write_tx_desc(struct /* * Interrupt functions. */ -static void rt73usb_beacondone(struct work_struct *work) +static void rt73usb_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry( &rt2x00dev->ring[RING_BEACON]); @@ -1908,10 +1904,9 @@ static void rt73usb_beacondone(struct wo dev_kfree_skb_any(skb); } -static void rt73usb_rxdone(struct work_struct *work) +static void rt73usb_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -1985,10 +1980,9 @@ static void rt73usb_rxdone(struct work_s } } -static void rt73usb_txdone(struct work_struct *work) +static void rt73usb_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct data_desc *txd; @@ -2405,13 +2399,11 @@ static void rt73usb_set_multicast_list(s } } -static void rt73usb_scan(struct work_struct *work) +static void rt73usb_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2419,34 +2411,34 @@ static void rt73usb_scan(struct work_str * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt73usb_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt73usb_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq, + rt2x00dev->scan->conf.scan_power_level); } else { rt73usb_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt73usb_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq, + rt2x00dev->scan->conf.scan_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2487,13 +2479,12 @@ static int rt73usb_passive_scan(struct i /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt73usb_scan); + INIT_WORK(&rt2x00dev->scan->work, rt73usb_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -3195,7 +3186,7 @@ static int rt73usb_alloc_dev(struct usb_ /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt73usb_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt73usb_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c 2007-03-02 16:16:05.000000000 -0500 @@ -617,12 +617,9 @@ static void rt2400pci_config_mac_address /* * Link tuning */ -static void rt2400pci_link_tuner(struct work_struct *work) +static void rt2400pci_link_tuner(void *data) { - struct link *link = - container_of(work, struct link, work.work); - struct rt2x00_dev *rt2x00dev = - container_of(link, struct rt2x00_dev, link); + struct rt2x00_dev *rt2x00dev = data; u8 reg; char false_cca_delta; @@ -757,7 +754,7 @@ static int rt2400pci_set_state(struct rt * Initialization functions. */ static int rt2400pci_alloc_dma_ring(struct rt2x00_dev *rt2x00dev, - enum ring_index ring_type, void (*handler)(struct work_struct *), + enum ring_index ring_type, void (*handler)(void *), const u16 max_entries, const u16 data_size, const u16 desc_size) { struct data_ring *ring = &rt2x00dev->ring[ring_type]; @@ -766,7 +763,7 @@ static int rt2400pci_alloc_dma_ring(stru /* * Initialize work structure for deferred work. */ - INIT_WORK(&ring->irq_work, handler); + INIT_WORK(&ring->irq_work, handler, ring); ring->stats.limit = max_entries; ring->data_size = data_size; @@ -1496,10 +1493,9 @@ static void rt2400pci_write_tx_desc(stru /* * Interrupt functions. */ -static void rt2400pci_beacondone(struct work_struct *work) +static void rt2400pci_beacondone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry = rt2x00_get_data_entry(ring); struct sk_buff *skb; @@ -1514,10 +1510,9 @@ static void rt2400pci_beacondone(struct dev_kfree_skb_any(skb); } -static void rt2400pci_rxdone(struct work_struct *work) +static void rt2400pci_rxdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct sk_buff *skb; @@ -1575,10 +1570,9 @@ static void rt2400pci_rxdone(struct work rt2400pci_activity_led(rt2x00dev, 0); } -static void rt2400pci_txdone(struct work_struct *work) +static void rt2400pci_txdone(void *data) { - struct data_ring *ring = - container_of(work, struct data_ring, irq_work); + struct data_ring *ring = data; struct rt2x00_dev *rt2x00dev = ring->rt2x00dev; struct data_entry *entry; struct data_desc *txd; @@ -2040,13 +2034,11 @@ static void rt2400pci_set_multicast_list rt2x00dev->interface.promisc); } -static void rt2400pci_scan(struct work_struct *work) +static void rt2400pci_scan(void *data) { - struct scanning *scan = - container_of(work, struct scanning, work); - struct rt2x00_dev *rt2x00dev = scan->rt2x00dev; + struct rt2x00_dev *rt2x00dev = data; - if (unlikely(!rt2x00dev)) + if (unlikely(!rt2x00dev->scan)) return; /* @@ -2054,38 +2046,38 @@ static void rt2400pci_scan(struct work_s * we need to wait untill all TX rings are empty to * guarentee that all frames are send on the correct channel. */ - if (rt2x00_wait_scan(scan)) + if (rt2x00_wait_scan(rt2x00dev->scan)) goto exit; /* * Switch channel and update active info for RX. */ - if (scan->state == IEEE80211_SCAN_START) { + if (rt2x00dev->scan->state == IEEE80211_SCAN_START) { rt2400pci_config_phymode(rt2x00dev, - scan->conf.scan_phymode); + rt2x00dev->scan->conf.scan_phymode); rt2400pci_config_channel(rt2x00dev, - scan->conf.scan_channel_val, - scan->conf.scan_channel, - scan->conf.scan_freq); + rt2x00dev->scan->conf.scan_channel_val, + rt2x00dev->scan->conf.scan_channel, + rt2x00dev->scan->conf.scan_freq); rt2400pci_config_txpower(rt2x00dev, - scan->conf.scan_power_level); + rt2x00dev->scan->conf.scan_power_level); } else { rt2400pci_config_phymode(rt2x00dev, - scan->conf.running_phymode); + rt2x00dev->scan->conf.running_phymode); rt2400pci_config_channel(rt2x00dev, - scan->conf.running_channel_val, - scan->conf.running_channel, - scan->conf.running_freq); + rt2x00dev->scan->conf.running_channel_val, + rt2x00dev->scan->conf.running_channel, + rt2x00dev->scan->conf.running_freq); rt2400pci_config_txpower(rt2x00dev, - scan->conf.running_power_level); + rt2x00dev->scan->conf.running_power_level); } exit: - kfree(scan); + kfree(rt2x00dev->scan); rt2x00dev->scan = NULL; } @@ -2126,13 +2118,12 @@ static int rt2400pci_passive_scan(struct /* * Initialize Scanning structure. */ - rt2x00dev->scan->rt2x00dev = rt2x00dev; rt2x00_start_scan(rt2x00dev->scan, conf, state); /* * Queue work. */ - INIT_WORK(&rt2x00dev->scan->work, rt2400pci_scan); + INIT_WORK(&rt2x00dev->scan->work, rt2400pci_scan, rt2x00dev); if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work)) goto exit; @@ -2727,7 +2718,7 @@ static int rt2400pci_alloc_dev(struct pc /* * Initialize configuration work. */ - INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2400pci_link_tuner); + INIT_WORK(&rt2x00dev->link.work, rt2400pci_link_tuner, rt2x00dev); /* * Reset current working type. --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c 2007-03-02 16:16:05.000000000 -0500 @@ -552,10 +552,9 @@ static int zd_mac_config_interface(struc return 0; } -static void set_multicast_hash_handler(struct work_struct *work) +static void set_multicast_hash_handler(void *_mac) { - struct zd_mac *mac = - container_of(work, struct zd_mac, set_multicast_hash_work); + struct zd_mac *mac = _mac; struct zd_mc_hash hash; spin_lock_irq(&mac->lock); @@ -655,7 +654,7 @@ struct ieee80211_hw *zd_mac_alloc(struct skb_queue_head_init(&mac->tx_queue); zd_chip_init(&mac->chip, dev, intf); housekeeping_init(mac); - INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler); + INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler, mac); SET_IEEE80211_DEV(dev, &intf->dev); return dev; @@ -663,10 +662,9 @@ struct ieee80211_hw *zd_mac_alloc(struct #define LINK_LED_WORK_DELAY HZ -static void link_led_handler(struct work_struct *work) +static void link_led_handler(void *p) { - struct zd_mac *mac = - container_of(work, struct zd_mac, housekeeping.link_led_work.work); + struct zd_mac *mac = p; struct zd_chip *chip = &mac->chip; int is_associated; int r; @@ -686,7 +684,7 @@ static void link_led_handler(struct work static void housekeeping_init(struct zd_mac *mac) { - INIT_DELAYED_WORK(&mac->housekeeping.link_led_work, link_led_handler); + INIT_WORK(&mac->housekeeping.link_led_work, link_led_handler, mac); } static void housekeeping_enable(struct zd_mac *mac) --- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h 2007-03-02 16:16:05.000000000 -0500 @@ -119,7 +119,7 @@ enum mac_flags { }; struct housekeeping { - struct delayed_work link_led_work; + struct work_struct link_led_work; }; #define ZD_MAC_STATS_BUFFER_SIZE 16 --- linux-2.6.19.noarch/net/wireless/nl80211.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/wireless/nl80211.c 2007-03-02 16:16:05.000000000 -0500 @@ -1002,7 +1002,8 @@ static struct genl_ops nl80211_ops[] = { void *nl80211hdr_put(struct sk_buff *skb, u32 pid, u32 seq, int flags, u8 cmd) { /* since there is no private header just add the generic one */ - return genlmsg_put(skb, pid, seq, &nl80211_fam, flags, cmd); + return genlmsg_put(skb, pid, seq, nl80211_fam.id, nl80211_fam.hdrsize, + flags, cmd, nl80211_fam.version); } EXPORT_SYMBOL_GPL(nl80211hdr_put); --- linux-2.6.19.noarch/net/wireless/core.c.orig 2007-03-02 16:21:41.000000000 -0500 +++ linux-2.6.19.noarch/net/wireless/core.c 2007-03-02 16:18:49.000000000 -0500 @@ -255,7 +255,7 @@ static int cfg80211_netdev_notifier_call case NETDEV_REGISTER: mutex_lock(&rdev->devlist_mtx); list_add(&dev->ieee80211_ptr->list, &rdev->netdev_list); - if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, + if (sysfs_create_link(&dev->class_dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { printk(KERN_ERR "wireless: failed to add phy80211 symlink to netdev!\n"); } @@ -264,7 +264,7 @@ static int cfg80211_netdev_notifier_call break; case NETDEV_UNREGISTER: mutex_lock(&rdev->devlist_mtx); - sysfs_remove_link(&dev->dev.kobj, "phy80211"); + sysfs_remove_link(&dev->class_dev.kobj, "phy80211"); list_del(&dev->ieee80211_ptr->list); mutex_unlock(&rdev->devlist_mtx); break; --- linux-2.6.19.noarch/net/mac80211/wme.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/wme.c 2007-03-02 16:16:05.000000000 -0500 @@ -417,8 +417,7 @@ static int wme_qdiscop_init(struct Qdisc /* create child queues */ for (i = 0; i < queues; i++) { skb_queue_head_init(&q->requeued[i]); - q->queues[i] = qdisc_create_dflt(qd->dev, &CHILD_QDISC_OPS, - qd->handle); + q->queues[i] = qdisc_create_dflt(qd->dev, &CHILD_QDISC_OPS); if (q->queues[i] == 0) { q->queues[i] = &noop_qdisc; printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i); @@ -644,7 +643,7 @@ void ieee80211_install_qdisc(struct net_ { struct Qdisc *qdisc; - qdisc = qdisc_create_dflt(dev, &wme_qdisc_ops, TC_H_ROOT); + qdisc = qdisc_create_dflt(dev, &wme_qdisc_ops); if (!qdisc) { printk(KERN_ERR "%s: qdisc installation failed\n", dev->name); return; --- linux-2.6.19.noarch/net/mac80211/ieee80211_i.h.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_i.h 2007-03-02 16:16:05.000000000 -0500 @@ -443,7 +443,7 @@ struct ieee80211_local { int scan_channel_idx; enum { SCAN_SET_CHANNEL, SCAN_SEND_PROBE } scan_state; unsigned long last_scan_completed; - struct delayed_work scan_work; + struct work_struct scan_work; struct net_device *scan_dev; struct ieee80211_channel *oper_channel, *scan_channel; struct ieee80211_hw_mode *oper_hw_mode, *scan_hw_mode; @@ -667,8 +666,8 @@ int ieee80211_init_client(struct net_dev int ieee80211_set_channel(struct ieee80211_local *local, int channel, int freq); /* ieee80211_sta.c */ void ieee80211_sta_timer(unsigned long data); -void ieee80211_sta_work(struct work_struct *work); -void ieee80211_sta_scan_work(struct work_struct *work); +void ieee80211_sta_scan_work(void *l); +void ieee80211_sta_work(void *ptr); void ieee80211_sta_rx_mgmt(struct net_device *dev, struct sk_buff *skb, struct ieee80211_rx_status *rx_status); int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len); --- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c 2007-03-02 16:16:05.000000000 -0500 @@ -24,6 +24,9 @@ static inline struct ieee80211_local *to return wiphy_priv(wiphy); } +#define to_net_dev(class) \ + container_of(class, struct net_device, class_dev) + static inline int rtnl_lock_local(struct ieee80211_local *local) { rtnl_lock(); @@ -364,12 +367,11 @@ static struct attribute_group ieee80211_ /* attributes in /sys/class/net/X/ */ -static ssize_t ieee80211_if_show(struct device *d, - struct device_attribute *attr, char *buf, +static ssize_t ieee80211_if_show(struct class_device *cd, char *buf, ssize_t (*format)(const struct ieee80211_sub_if_data *, char *)) { - struct net_device *dev = to_net_dev(d); + struct net_device *dev = to_net_dev(cd); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); ssize_t ret = -EINVAL; @@ -409,13 +411,12 @@ static ssize_t ieee80211_if_fmt_##name(c } #define __IEEE80211_IF_SHOW(name) \ -static ssize_t ieee80211_if_show_##name(struct device *d, \ - struct device_attribute *attr, \ +static ssize_t ieee80211_if_show_##name(struct class_device *cd, \ char *buf) \ { \ - return ieee80211_if_show(d, attr, buf, ieee80211_if_fmt_##name);\ + return ieee80211_if_show(cd, buf, ieee80211_if_fmt_##name); \ } \ -static DEVICE_ATTR(name, S_IRUGO, ieee80211_if_show_##name, NULL); +static CLASS_DEVICE_ATTR(name, S_IRUGO, ieee80211_if_show_##name, NULL); #define IEEE80211_IF_SHOW(name, field, format) \ IEEE80211_IF_FMT_##format(name, field) \ @@ -509,64 +510,64 @@ static ssize_t ieee80211_if_fmt_mode(con __IEEE80211_IF_SHOW(mode); static struct attribute *ieee80211_sta_attrs[] = { - &dev_attr_channel_use.attr, - &dev_attr_drop_unencrypted.attr, - &dev_attr_eapol.attr, - &dev_attr_ieee8021_x.attr, - &dev_attr_state.attr, - &dev_attr_bssid.attr, - &dev_attr_prev_bssid.attr, - &dev_attr_ssid_len.attr, - &dev_attr_aid.attr, - &dev_attr_ap_capab.attr, - &dev_attr_capab.attr, - &dev_attr_extra_ie_len.attr, - &dev_attr_auth_tries.attr, - &dev_attr_assoc_tries.attr, - &dev_attr_auth_algs.attr, - &dev_attr_auth_alg.attr, - &dev_attr_auth_transaction.attr, - &dev_attr_flags.attr, + &class_device_attr_channel_use.attr, + &class_device_attr_drop_unencrypted.attr, + &class_device_attr_eapol.attr, + &class_device_attr_ieee8021_x.attr, + &class_device_attr_state.attr, + &class_device_attr_bssid.attr, + &class_device_attr_prev_bssid.attr, + &class_device_attr_ssid_len.attr, + &class_device_attr_aid.attr, + &class_device_attr_ap_capab.attr, + &class_device_attr_capab.attr, + &class_device_attr_extra_ie_len.attr, + &class_device_attr_auth_tries.attr, + &class_device_attr_assoc_tries.attr, + &class_device_attr_auth_algs.attr, + &class_device_attr_auth_alg.attr, + &class_device_attr_auth_transaction.attr, + &class_device_attr_flags.attr, NULL }; static struct attribute *ieee80211_ap_attrs[] = { - &dev_attr_channel_use.attr, - &dev_attr_drop_unencrypted.attr, - &dev_attr_eapol.attr, - &dev_attr_ieee8021_x.attr, - &dev_attr_num_sta_ps.attr, - &dev_attr_dtim_period.attr, - &dev_attr_dtim_count.attr, - &dev_attr_num_beacons.attr, - &dev_attr_force_unicast_rateidx.attr, - &dev_attr_max_ratectrl_rateidx.attr, - &dev_attr_num_buffered_multicast.attr, - &dev_attr_beacon_head_len.attr, - &dev_attr_beacon_tail_len.attr, + &class_device_attr_channel_use.attr, + &class_device_attr_drop_unencrypted.attr, + &class_device_attr_eapol.attr, + &class_device_attr_ieee8021_x.attr, + &class_device_attr_num_sta_ps.attr, + &class_device_attr_dtim_period.attr, + &class_device_attr_dtim_count.attr, + &class_device_attr_num_beacons.attr, + &class_device_attr_force_unicast_rateidx.attr, + &class_device_attr_max_ratectrl_rateidx.attr, + &class_device_attr_num_buffered_multicast.attr, + &class_device_attr_beacon_head_len.attr, + &class_device_attr_beacon_tail_len.attr, NULL }; static struct attribute *ieee80211_wds_attrs[] = { - &dev_attr_channel_use.attr, - &dev_attr_drop_unencrypted.attr, - &dev_attr_eapol.attr, - &dev_attr_ieee8021_x.attr, - &dev_attr_peer.attr, + &class_device_attr_channel_use.attr, + &class_device_attr_drop_unencrypted.attr, + &class_device_attr_eapol.attr, + &class_device_attr_ieee8021_x.attr, + &class_device_attr_peer.attr, NULL }; static struct attribute *ieee80211_vlan_attrs[] = { - &dev_attr_channel_use.attr, - &dev_attr_drop_unencrypted.attr, - &dev_attr_eapol.attr, - &dev_attr_ieee8021_x.attr, - &dev_attr_vlan_id.attr, + &class_device_attr_channel_use.attr, + &class_device_attr_drop_unencrypted.attr, + &class_device_attr_eapol.attr, + &class_device_attr_ieee8021_x.attr, + &class_device_attr_vlan_id.attr, NULL }; static struct attribute *ieee80211_monitor_attrs[] = { - &dev_attr_mode.attr, + &class_device_attr_mode.attr, NULL }; @@ -694,14 +695,14 @@ out: int ieee80211_sysfs_change_if_type(struct net_device *dev) { - return ieee80211_add_if_group(&dev->dev.kobj, dev); + return ieee80211_add_if_group(&dev->class_dev.kobj, dev); } int ieee80211_sysfs_add_netdevice(struct net_device *dev) { int res; - res = ieee80211_add_if_group(&dev->dev.kobj, dev); + res = ieee80211_add_if_group(&dev->class_dev.kobj, dev); if (res) goto err_fail_if_group; res = ieee80211_key_kset_sysfs_register(IEEE80211_DEV_TO_SUB_IF(dev)); @@ -714,5 +715,5 @@ err_fail_if_group: void ieee80211_sysfs_remove_netdevice(struct net_device *dev) { ieee80211_key_kset_sysfs_unregister(IEEE80211_DEV_TO_SUB_IF(dev)); - ieee80211_remove_if_group(&dev->dev.kobj, dev); + ieee80211_remove_if_group(&dev->class_dev.kobj, dev); } --- linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c 2007-03-02 16:16:05.000000000 -0500 @@ -181,7 +181,7 @@ void ieee80211_if_set_type(struct net_de struct ieee80211_if_sta *ifsta; ifsta = &sdata->u.sta; - INIT_WORK(&ifsta->work, ieee80211_sta_work); + INIT_WORK(&ifsta->work, ieee80211_sta_work, dev); setup_timer(&ifsta->timer, ieee80211_sta_timer, (unsigned long) ifsta); skb_queue_head_init(&ifsta->skb_queue); --- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c 2007-03-02 16:16:05.000000000 -0500 @@ -387,7 +387,7 @@ int ieee80211_key_kset_sysfs_register(st res = kobject_set_name(&sdata->key_kset.kobj, "keys"); if (res) return res; - sdata->key_kset.kobj.parent = &sdata->dev->dev.kobj; + sdata->key_kset.kobj.parent = &sdata->dev->class_dev.kobj; sdata->key_kset.ktype = &key_ktype; return kset_register(&sdata->key_kset); } --- linux-2.6.19.noarch/net/mac80211/sta_info.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/sta_info.c 2007-03-02 16:16:05.000000000 -0500 @@ -342,10 +342,9 @@ static void sta_info_cleanup(unsigned lo } -static void sta_info_proc_add_task(struct work_struct *work) +static void sta_info_proc_add_task(void *data) { - struct ieee80211_local *local = - container_of(work, struct ieee80211_local, sta_proc_add); + struct ieee80211_local *local = data; struct sta_info *sta, *tmp; while (1) { @@ -396,7 +395,7 @@ void sta_info_init(struct ieee80211_loca local->sta_cleanup.data = (unsigned long) local; local->sta_cleanup.function = sta_info_cleanup; - INIT_WORK(&local->sta_proc_add, sta_info_proc_add_task); + INIT_WORK(&local->sta_proc_add, sta_info_proc_add_task, local); } int sta_info_start(struct ieee80211_local *local) --- linux-2.6.19.noarch/net/mac80211/wep.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/wep.c 2007-03-02 16:16:05.000000000 -0500 @@ -15,7 +15,6 @@ #include #include #include -#include #include #include --- linux-2.6.19.noarch/net/mac80211/ieee80211.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211.c 2007-03-02 16:16:05.000000000 -0500 @@ -4584,7 +4584,7 @@ struct ieee80211_hw *ieee80211_alloc_hw( spin_lock_init(&local->sub_if_lock); INIT_LIST_HEAD(&local->sub_if_list); - INIT_DELAYED_WORK(&local->scan_work, ieee80211_sta_scan_work); + INIT_WORK(&local->scan_work, ieee80211_sta_scan_work, local); init_timer(&local->stat_timer); local->stat_timer.function = ieee80211_stat_refresh; local->stat_timer.data = (unsigned long) local; --- linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c.orig 2007-03-02 16:15:56.000000000 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c 2007-03-02 16:16:05.000000000 -0500 @@ -1898,11 +1898,10 @@ void ieee80211_sta_timer(unsigned long d } -void ieee80211_sta_work(struct work_struct *work) +void ieee80211_sta_work(void *ptr) { - struct ieee80211_sub_if_data *sdata = - container_of(work, struct ieee80211_sub_if_data, u.sta.work); - struct net_device *dev = sdata->dev; + struct net_device *dev = ptr; + struct ieee80211_sub_if_data *sdata; struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); struct ieee80211_if_sta *ifsta; struct sk_buff *skb; @@ -2541,10 +2540,9 @@ void ieee80211_scan_completed(struct iee } EXPORT_SYMBOL(ieee80211_scan_completed); -void ieee80211_sta_scan_work(struct work_struct *work) +void ieee80211_sta_scan_work(void *l) { - struct ieee80211_local *local = - container_of(work, struct ieee80211_local, scan_work.work); + struct ieee80211_local *local = l; struct net_device *dev = local->scan_dev; struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_hw_mode *mode; jwltest-mac80211-backport.patch: CREDITS | 33 MAINTAINERS | 43 drivers/Kconfig | 2 drivers/Makefile | 1 drivers/net/wireless/Kconfig | 2 drivers/net/wireless/Makefile | 3 drivers/net/wireless/mac80211/Kconfig | 6 drivers/net/wireless/mac80211/Makefile | 6 drivers/net/wireless/mac80211/README | 2 drivers/net/wireless/mac80211/adm8211/Kconfig | 24 drivers/net/wireless/mac80211/adm8211/Makefile | 1 drivers/net/wireless/mac80211/adm8211/adm8211.c | 2188 +++++++ drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 ++ drivers/net/wireless/mac80211/bcm43xx/Kconfig | 99 drivers/net/wireless/mac80211/bcm43xx/Makefile | 17 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 870 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1297 ++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1051 +++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 89 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 3962 ++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pci.c | 61 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pci.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4234 +++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 307 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.c | 202 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.h | 83 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 615 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 215 drivers/net/wireless/mac80211/p54/Kconfig | 9 drivers/net/wireless/mac80211/p54/Makefile | 4 drivers/net/wireless/mac80211/p54/net2280.h | 452 + drivers/net/wireless/mac80211/p54/prism54.h | 77 drivers/net/wireless/mac80211/p54/prism54common.c | 807 ++ drivers/net/wireless/mac80211/p54/prism54common.h | 304 drivers/net/wireless/mac80211/p54/prism54magic.h | 77 drivers/net/wireless/mac80211/p54/prism54pci.c | 698 ++ drivers/net/wireless/mac80211/p54/prism54pci.h | 106 drivers/net/wireless/mac80211/p54/prism54usb.c | 946 +++ drivers/net/wireless/mac80211/p54/prism54usb.h | 133 drivers/net/wireless/mac80211/rt2x00/Kconfig | 83 drivers/net/wireless/mac80211/rt2x00/Makefile | 5 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 2985 +++++++++ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 967 +++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 3297 ++++++++++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1234 +++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 3131 ++++++++++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 739 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1268 ++++ drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 44 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 81 drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 3827 ++++++++++++ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1398 ++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 3467 +++++++++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 980 +++ drivers/net/wireless/mac80211/rtl818x/Kconfig | 8 drivers/net/wireless/mac80211/rtl818x/Makefile | 2 drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 712 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 738 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 28 drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 175 drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19 drivers/net/wireless/mac80211/zd1211rw/Makefile | 11 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1674 +++++ drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 909 ++ drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 705 ++ drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 156 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 81 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 373 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 274 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1324 ++++ drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241 drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82 drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29 drivers/ssb/Kconfig | 93 drivers/ssb/Makefile | 14 drivers/ssb/core.c | 956 +++ drivers/ssb/driver_chipcommon/chipcommon.c | 402 + drivers/ssb/driver_mips/mips.c | 258 drivers/ssb/driver_pci/pcicore.c | 556 + drivers/ssb/pci.c | 667 ++ drivers/ssb/pcihost_wrapper.c | 104 drivers/ssb/pcmcia.c | 256 drivers/ssb/scan.c | 427 + drivers/ssb/ssb_private.h | 152 drivers/usb/host/Kconfig | 10 drivers/usb/host/ohci-hcd.c | 4 drivers/usb/host/ohci-ssb.c | 193 include/linux/Kbuild | 2 include/linux/crc-itu-t.h | 27 include/linux/eeprom_93cx6.h | 77 include/linux/ieee80211.h | 330 + include/linux/netdevice.h | 5 include/linux/nl80211.h | 275 include/linux/ssb/ssb.h | 388 + include/linux/ssb/ssb_driver_chipcommon.h | 387 + include/linux/ssb/ssb_driver_extif.h | 163 include/linux/ssb/ssb_driver_mips.h | 47 include/linux/ssb/ssb_driver_pci.h | 108 include/linux/ssb/ssb_regs.h | 294 include/net/cfg80211.h | 169 include/net/iw_handler.h | 3 include/net/mac80211.h | 1079 +++ include/net/wireless.h | 153 lib/Kconfig | 16 lib/Makefile | 3 lib/crc-itu-t.c | 64 lib/eeprom_93cx6.c | 344 + net/Kconfig | 3 net/Makefile | 2 net/core/Makefile | 1 net/core/dev.c | 33 net/core/wireless.c | 2353 ------- net/mac80211/Kconfig | 73 net/mac80211/Makefile | 26 net/mac80211/aes_ccm.c | 155 net/mac80211/aes_ccm.h | 26 net/mac80211/fifo_qdisc.c | 102 net/mac80211/hostapd_ioctl.h | 434 + net/mac80211/ieee80211.c | 4940 ++++++++++++++++ net/mac80211/ieee80211_cfg.c | 90 net/mac80211/ieee80211_cfg.h | 9 net/mac80211/ieee80211_common.h | 98 net/mac80211/ieee80211_i.h | 720 ++ net/mac80211/ieee80211_iface.c | 372 + net/mac80211/ieee80211_ioctl.c | 3304 ++++++++++ net/mac80211/ieee80211_key.h | 89 net/mac80211/ieee80211_led.c | 91 net/mac80211/ieee80211_led.h | 32 net/mac80211/ieee80211_rate.c | 140 net/mac80211/ieee80211_rate.h | 161 net/mac80211/ieee80211_scan.c | 344 + net/mac80211/ieee80211_sta.c | 3013 +++++++++ net/mac80211/ieee80211_sysfs.c | 718 ++ net/mac80211/ieee80211_sysfs.h | 12 net/mac80211/ieee80211_sysfs_sta.c | 438 + net/mac80211/michael.c | 104 net/mac80211/michael.h | 20 net/mac80211/rc80211_simple.c | 399 + net/mac80211/sta_info.c | 461 + net/mac80211/sta_info.h | 150 net/mac80211/tkip.c | 341 + net/mac80211/tkip.h | 36 net/mac80211/wep.c | 328 + net/mac80211/wep.h | 40 net/mac80211/wme.c | 679 ++ net/mac80211/wme.h | 38 net/mac80211/wpa.c | 846 ++ net/mac80211/wpa.h | 34 net/wireless/Kconfig | 31 net/wireless/Makefile | 17 net/wireless/core.c | 321 + net/wireless/core.h | 77 net/wireless/nl80211.c | 1051 +++ net/wireless/nl80211.h | 17 net/wireless/sysfs.c | 125 net/wireless/sysfs.h | 9 net/wireless/wext-common.c | 663 ++ net/wireless/wext-compat.c | 819 ++ net/wireless/wext-export.c | 29 net/wireless/wext-mod.c | 20 net/wireless/wext-old.c | 1461 ++++ net/wireless/wext.h | 51 183 files changed, 86288 insertions(+), 2390 deletions(-) --- NEW FILE jwltest-mac80211-backport.patch --- --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.19.noarch/include/net/wireless.h 2007-03-02 14:57:04.000000000 -0500 @@ -0,0 +1,153 @@ +#ifndef __NET_WIRELESS_H +#define __NET_WIRELESS_H + +/* + * 802.11 device management + * + * Copyright 2007 Johannes Berg + */ + +#include +#include +#include +#include + +/** + * struct wiphy - wireless hardware description + * @idx: the wiphy index assigned to this item + * @class_dev: the class device representing /sys/class/ieee80211/ + */ +struct wiphy { + /* assign these fields before you register the wiphy */ + + /* permanent MAC address */ + u8 perm_addr[ETH_ALEN]; + + /* fields below are read-only, assigned by cfg80211 */ + + /* the item in /sys/class/ieee80211/ points to this, + * you need use set_wiphy_dev() (see below) */ + struct device dev; + + /* dir in debugfs: ieee80211/ */ + struct dentry *debugfsdir; + + char priv[0] __attribute__((__aligned__(NETDEV_ALIGN))); +}; + +/** struct wireless_dev - wireless per-netdev state + * + * This structure must be allocated by the driver/stack + * that uses the ieee80211_ptr field in struct net_device + * (this is intentional so it can be allocated along with + * the netdev.) + * + * @wiphy: pointer to hardware description + */ +struct wireless_dev { + struct wiphy *wiphy; + + /* private to the generic wireless code */ + struct cfg80211_config pending_config; + struct list_head list; + struct net_device *netdev; +}; + +/** + * wiphy_priv - return priv from wiphy + */ +static inline void *wiphy_priv(struct wiphy *wiphy) +{ + BUG_ON(!wiphy); + return &wiphy->priv; +} + +/** + * set_wiphy_dev - set device pointer for wiphy + */ +static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev) +{ + wiphy->dev.parent = dev; +} + +/** + * wiphy_dev - get wiphy dev pointer + */ +static inline struct device *wiphy_dev(struct wiphy *wiphy) +{ + return wiphy->dev.parent; +} + +/** + * wiphy_name - get wiphy name + */ +static inline char *wiphy_name(struct wiphy *wiphy) +{ + return wiphy->dev.bus_id; +} + +/** + * wdev_priv - return wiphy priv from wireless_dev + */ +static inline void *wdev_priv(struct wireless_dev *wdev) +{ + BUG_ON(!wdev); + return wiphy_priv(wdev->wiphy); +} + +/** + * wiphy_new - create a new wiphy for use with cfg80211 + * + * create a new wiphy and associate the given operations with it. + * @sizeof_priv bytes are allocated for private use. + * + * the returned pointer must be assigned to each netdev's + * ieee80211_ptr for proper operation. + */ +struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv); + +/** + * wiphy_register - register a wiphy with cfg80211 + * + * register the given wiphy + * + * Returns a non-negative wiphy index or a negative error code. + */ +extern int wiphy_register(struct wiphy *wiphy); + +/** + * wiphy_unregister - deregister a wiphy from cfg80211 + * + * unregister a device with the given priv pointer. + * After this call, no more requests can be made with this priv + * pointer, but the call may sleep to wait for an outstanding + * request that is being handled. + */ +extern void wiphy_unregister(struct wiphy *wiphy); + +/** + * wiphy_free - free wiphy + */ +extern void wiphy_free(struct wiphy *wiphy); + + +/* + * internal definitions for wireless + */ + +#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT) +int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg); +int wireless_proc_init(void); +#else +static inline +int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg) +{ + return -EINVAL; +} +static inline int wireless_proc_init(void) +{ + return 0; +} +#endif + +#endif /* __NET_WIRELESS_H */ --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.19.noarch/include/net/mac80211.h 2007-03-02 14:57:04.000000000 -0500 @@ -0,0 +1,1079 @@ +/* + * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface + * Copyright 2002-2005, Devicescape Software, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef MAC80211_H +#define MAC80211_H + +#include +#include +#include +#include +#include +#include +#include +#include + +/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be + * called in hardware interrupt context. The low-level driver must not call any + * other functions in hardware interrupt context. If there is a need for such + * call, the low-level driver should first ACK the interrupt and perform the + * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in + * software interrupt context). + */ + +/* + * Frame format used when passing frame between low-level hardware drivers + * and IEEE 802.11 driver the same as used in the wireless media, i.e., + * buffers start with IEEE 802.11 header and include the same octets that + * are sent over air. + * + * If hardware uses IEEE 802.3 headers (and perform 802.3 <-> 802.11 + * conversion in firmware), upper layer 802.11 code needs to be changed to + * support this. + * + * If the receive frame format is not the same as the real frame sent [...89075 lines suppressed...] + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, + &iwe, buf); + kfree(buf); + } + } + + do { + char *buf, *p; + int i; + + if (!(local->scan_flags & IEEE80211_SCAN_EXTRA_INFO)) + break; + + buf = kmalloc(100, GFP_ATOMIC); + if (!buf) + break; + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "bcn_int=%d", bss->beacon_int); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "rssi=%d", bss->rssi); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "capab=0x%04x", bss->capability); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + /* dispaly all support rates in readable format */ + p = current_ev + IW_EV_LCP_LEN; + iwe.cmd = SIOCGIWRATE; + /* Those two flags are ignored... */ + iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0; + + for (i = 0; i < bss->supp_rates_len; i++) { + iwe.u.bitrate.value = ((bss->supp_rates[i] & + 0x7f) * 500000); + p = iwe_stream_add_value(current_ev, p, + end_buf, &iwe, IW_EV_PARAM_LEN); + } + /* Check if we added any rate */ + if((p - current_ev) > IW_EV_LCP_LEN) + current_ev = p; + + kfree(buf); + break; + } while (0); + + return current_ev; +} + + +int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len) +{ + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + char *current_ev = buf; + char *end_buf = buf + len; + struct ieee80211_sta_bss *bss; + + spin_lock_bh(&local->sta_bss_lock); + list_for_each_entry(bss, &local->sta_bss_list, list) { + if (buf + len - current_ev <= IW_EV_ADDR_LEN) { + spin_unlock_bh(&local->sta_bss_lock); + return -E2BIG; + } + current_ev = ieee80211_sta_scan_result(dev, bss, current_ev, + end_buf); + } + spin_unlock_bh(&local->sta_bss_lock); + return current_ev - buf; +} + + +int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + kfree(ifsta->extra_ie); + if (len == 0) { + ifsta->extra_ie = NULL; + ifsta->extra_ie_len = 0; + return 0; + } + ifsta->extra_ie = kmalloc(len, GFP_KERNEL); + if (!ifsta->extra_ie) { + ifsta->extra_ie_len = 0; + return -ENOMEM; + } + memcpy(ifsta->extra_ie, ie, len); + ifsta->extra_ie_len = len; + return 0; +} + + +struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev, + struct sk_buff *skb, u8 *bssid, + u8 *addr) +{ + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + struct sta_info *sta; + struct ieee80211_sub_if_data *sdata = NULL; + struct net_device *sta_dev = NULL; + + /* TODO: Could consider removing the least recently used entry and + * allow new one to be added. */ + if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) { + if (net_ratelimit()) { + printk(KERN_DEBUG "%s: No room for a new IBSS STA " + "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr)); + } + return NULL; + } + + spin_lock_bh(&local->sub_if_lock); + list_for_each_entry(sdata, &local->sub_if_list, list) + if (sdata->type == IEEE80211_IF_TYPE_IBSS && + memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) { + sta_dev = sdata->dev; + break; + } + spin_unlock_bh(&local->sub_if_lock); + + if (!sta_dev) + return NULL; + + printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n", + dev->name, MAC_ARG(addr), sta_dev->name); + + sta = sta_info_add(local, dev, addr, GFP_ATOMIC); + if (!sta) + return NULL; + + sta->dev = sta_dev; + sta->supp_rates = sdata->u.sta.supp_rates_bits; + + rate_control_rate_init(sta, local); + + return sta; /* caller will call sta_info_put() */ +} + + +int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + + printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n", + dev->name, reason); + + if (sdata->type != IEEE80211_IF_TYPE_STA && + sdata->type != IEEE80211_IF_TYPE_IBSS) + return -EINVAL; + + ieee80211_send_deauth(dev, ifsta, reason); + ieee80211_set_disassoc(dev, ifsta, 1); + return 0; +} + + +int ieee80211_sta_disassociate(struct net_device *dev, u16 reason) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + + printk(KERN_DEBUG "%s: disassociate(reason=%d)\n", + dev->name, reason); + + if (sdata->type != IEEE80211_IF_TYPE_STA) + return -EINVAL; + + if (!ifsta->associated) + return -1; + + ieee80211_send_disassoc(dev, ifsta, reason); + ieee80211_set_disassoc(dev, ifsta, 0); + return 0; +} --- /dev/null 2006-11-15 09:57:50.578980680 -0500 +++ linux-2.6.19.noarch/net/mac80211/ieee80211_cfg.h 2007-03-02 14:57:05.000000000 -0500 @@ -0,0 +1,9 @@ +/* + * mac80211 configuration hooks for cfg80211 + */ +#ifndef __IEEE80211_CFG_H +#define __IEEE80211_CFG_H + +extern struct cfg80211_ops mac80211_config_ops; + +#endif /* __IEEE80211_CFG_H */ jwltest-softmac_wx_get_rate-running-check.patch: ieee80211softmac_wx.c | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE jwltest-softmac_wx_get_rate-running-check.patch --- --- linux-2.6.18.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig 2006-12-12 13:16:33.000000000 -0500 +++ linux-2.6.18.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c 2006-12-12 13:22:05.000000000 -0500 @@ -265,6 +265,12 @@ ieee80211softmac_wx_get_rate(struct net_ int err = -EINVAL; spin_lock_irqsave(&mac->lock, flags); + + if (unlikely(!mac->running)) { + err = -ENODEV; + goto out_unlock; + } + switch (mac->txrates.default_rate) { case IEEE80211_CCK_RATE_1MB: data->bitrate.value = 1000000; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2911.6.5 retrieving revision 1.2911.6.5.2.1 diff -u -r1.2911.6.5 -r1.2911.6.5.2.1 --- kernel-2.6.spec 4 Mar 2007 20:34:50 -0000 1.2911.6.5 +++ kernel-2.6.spec 6 Mar 2007 22:22:32 -0000 1.2911.6.5.2.1 @@ -33,7 +33,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}.jwltest.25 %define signmodules 0 %define xen_hv_cset 11774 %define make_target bzImage @@ -419,6 +419,13 @@ # core networking changes. +# NIC driver fixes +Patch1350: jwltest-bcm43xx-2_6_20.patch +Patch1351: jwltest-bcm43xx-workqueue-undo.patch +Patch1352: jwltest-bcm43xx-host_strip_iv_icv-undo.patch +Patch1353: jwltest-bcm43xx-post-2_6_20.patch +Patch1354: jwltest-softmac_wx_get_rate-running-check.patch + # Sound driver fixes # Filesystem stuff. @@ -497,6 +504,14 @@ Patch5060: linux-2.6-olpc-battery.patch # +# mac80211 backport +# +Patch6000: jwltest-mac80211-backport.patch +Patch6001: jwltest-mac80211-backport-2_6_19-fixup.patch +Patch6002: jwltest-iwlwifi.patch +Patch6003: jwltest-iwlwifi-2_6_19-fixup.patch + +# # 10000 to 20000 is for stuff that has to come last due to the # amount of drivers they touch. But only these should go here. # Not patches you're too lazy for to put in the proper place. @@ -991,6 +1006,18 @@ # core networking changes. +# NIC driver fixes +# bcm43xx: update to version from 2.6.20 +%patch1350 -p1 +# bcm43xx: revert workqueue-related changes +%patch1351 -p1 +# bcm43xx: revert host_strip_iv_icv-related changes +%patch1352 -p1 +# bcm43xx: update to version from 2007-02-08 +%patch1353 -p1 +# check mac->running to avoid assert in ieee80211softmac_wx_get_rate +%patch1354 -p1 + # sound driver fixes # Filesystem patches. @@ -1119,6 +1146,12 @@ # final stuff # +# mac80211 stuff +%patch6000 -p1 +%patch6001 -p1 +%patch6002 -p1 +%patch6003 -p1 + # # misc small stuff to make things compile or otherwise improve performance # From fedora-cvs-commits at redhat.com Tue Mar 6 22:25:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 17:25:14 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.382, 1.383 anaconda.spec, 1.509, 1.510 sources, 1.506, 1.507 Message-ID: <200703062225.l26MPEge002520@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2498 Modified Files: .cvsignore anaconda.spec sources Log Message: * Tue Mar 6 2007 David Cantrell - 11.2.0.31-1 - Smaller required height for main window for livecd installs (katzj) - Move utility functions around in isys - Init loopback in stage 1 using ioctl() rather than netlink (#229670) - Handle netlink messages for RTM_GETLINK that are larger than 4K (#230525) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- .cvsignore 6 Mar 2007 03:07:15 -0000 1.382 +++ .cvsignore 6 Mar 2007 22:25:07 -0000 1.383 @@ -1 +1 @@ -anaconda-11.2.0.30.tar.bz2 +anaconda-11.2.0.31.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.509 retrieving revision 1.510 diff -u -r1.509 -r1.510 --- anaconda.spec 6 Mar 2007 03:07:15 -0000 1.509 +++ anaconda.spec 6 Mar 2007 22:25:07 -0000 1.510 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.30 +Version: 11.2.0.31 Release: 1 License: GPL Summary: Graphical system installer @@ -113,6 +113,12 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 6 2007 David Cantrell - 11.2.0.31-1 +- Smaller required height for main window for livecd installs (katzj) +- Move utility functions around in isys +- Init loopback in stage 1 using ioctl() rather than netlink (#229670) +- Handle netlink messages for RTM_GETLINK that are larger than 4K (#230525) + * Mon Mar 5 2007 Jeremy Katz - 11.2.0.30-1 - ext2 is a module now - add a basic boot drive selector to the graphical autopartitioning screen Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.506 retrieving revision 1.507 diff -u -r1.506 -r1.507 --- sources 6 Mar 2007 03:07:15 -0000 1.506 +++ sources 6 Mar 2007 22:25:07 -0000 1.507 @@ -1 +1 @@ -140941d3caa5ae250f0a452c7f8636a0 anaconda-11.2.0.30.tar.bz2 +c26ae43d4a0588850fe5574d20d6b87c anaconda-11.2.0.31.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 6 23:17:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 18:17:26 -0500 Subject: rpms/ekiga/FC-6 ekiga-2.0.2-format-string.patch, NONE, 1.1 ekiga.spec, 1.31, 1.32 Message-ID: <200703062317.l26NHQAj020034@cvs.devel.redhat.com> Author: sandmann Update of /cvs/dist/rpms/ekiga/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20013 Modified Files: ekiga.spec Added Files: ekiga-2.0.2-format-string.patch Log Message: Fix printf type functions ekiga-2.0.2-format-string.patch: lib/gui/gmdialog.h | 10 +++++----- lib/gui/gmstatusbar.c | 10 +++------- lib/gui/gmstatusbar.h | 6 +++--- src/devices/videoinput.cpp | 4 ++-- src/endpoints/accountshandler.cpp | 12 ++++++------ src/endpoints/manager.cpp | 12 ++++++------ src/endpoints/sip.cpp | 6 +++--- src/endpoints/urlhandler.cpp | 4 ++-- src/gui/accounts.cpp | 2 +- src/gui/addressbook.cpp | 4 ++-- src/gui/chat.cpp | 13 ++++++++++--- src/gui/chat.h | 2 +- src/gui/history.h | 2 +- src/gui/main.cpp | 15 +++++++++------ src/gui/main.h | 6 +++--- src/gui/misc.cpp | 2 +- 16 files changed, 58 insertions(+), 52 deletions(-) --- NEW FILE ekiga-2.0.2-format-string.patch --- --- ekiga-2.0.5/src/gui/chat.cpp.format-string 2007-02-13 15:28:57.000000000 -0500 +++ ekiga-2.0.5/src/gui/chat.cpp 2007-03-06 17:48:30.000000000 -0500 @@ -1687,7 +1687,14 @@ contact_url = gtk_entry_get_text (GTK_ENTRY (twp->remote_url)); - if (!url || GMURL (contact_url) == GMURL (url)) - gm_statusbar_push_info_message (GM_STATUSBAR (tw->statusbar), msg, args); - va_end (args); + if (!url || GMURL (contact_url) == GMURL (url)) { + char *buffer; + va_list args; + va_start (args, msg); + buffer = g_strdup_vprintf (msg, args); + va_end (args); + + gm_statusbar_push_info_message (GM_STATUSBAR (tw->statusbar), "%s", buffer); + g_free (buffer); + } } --- ekiga-2.0.5/src/gui/addressbook.cpp.format-string 2007-02-13 15:28:57.000000000 -0500 +++ ekiga-2.0.5/src/gui/addressbook.cpp 2007-03-06 17:48:30.000000000 -0500 @@ -3163,7 +3163,7 @@ dialog = gtk_message_dialog_new (GTK_WINDOW (parent_window), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, confirm_msg); + GTK_BUTTONS_YES_NO, "%s", confirm_msg); g_free (confirm_msg); gtk_dialog_set_default_response (GTK_DIALOG (dialog), @@ -3640,7 +3640,7 @@ dialog = gtk_message_dialog_new (GTK_WINDOW (addressbook_window), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, confirm_msg); + GTK_BUTTONS_YES_NO, "%s", confirm_msg); g_free (confirm_msg); gtk_dialog_set_default_response (GTK_DIALOG (dialog), --- ekiga-2.0.5/src/gui/main.cpp.format-string 2007-02-13 15:28:57.000000000 -0500 +++ ekiga-2.0.5/src/gui/main.cpp 2007-03-06 17:48:30.000000000 -0500 @@ -2311,7 +2311,7 @@ info = g_strdup_printf (_("Missed calls: %d - Voice Mails: %s"), ep->GetMissedCallsNumber (), (const char *) ep->GetMWI ()); - gm_main_window_push_info_message (GTK_WIDGET (data), info); + gm_main_window_push_info_message (GTK_WIDGET (data), "%s", info); g_free (info); @@ -4286,7 +4286,7 @@ va_start (args, msg); vsnprintf (buffer, 1024, msg, args); - gm_statusbar_flash_message (GM_STATUSBAR (mw->statusbar), buffer); + gm_statusbar_flash_message (GM_STATUSBAR (mw->statusbar), "%s", buffer); va_end (args); } @@ -4306,7 +4306,7 @@ mw = gm_mw_get_mw (main_window); info = g_strdup_printf (_("Missed calls: %d - Voice Mails: %s"), missed, vm); - gm_main_window_push_info_message (main_window, info); + gm_main_window_push_info_message (main_window, "%s", info); g_free (info); } @@ -4329,7 +4329,7 @@ va_start (args, msg); vsnprintf (buffer, 1024, msg, args); - gm_statusbar_push_message (GM_STATUSBAR (mw->statusbar), buffer); + gm_statusbar_push_message (GM_STATUSBAR (mw->statusbar), "%s", buffer); va_end (args); } @@ -4340,6 +4340,7 @@ ...) { GmWindow *mw = NULL; + char *buffer; g_return_if_fail (main_window != NULL); @@ -4348,7 +4349,9 @@ va_list args; va_start (args, msg); - gm_statusbar_push_info_message (GM_STATUSBAR (mw->statusbar), msg, args); + buffer = g_strdup_vprintf (msg, args); + gm_statusbar_push_info_message (GM_STATUSBAR (mw->statusbar), "%s", buffer); + g_free (buffer); va_end (args); } @@ -4570,7 +4573,7 @@ msg = g_strdup_printf (_("Ekiga got an invalid value for the GConf key %s.\n\nIt probably means that your GConf schemas have not been correctly installed or the that permissions are not correct.\n\nPlease check the FAQ (http://www.ekiga.org/), the troubleshooting section of the GConf site (http://www.gnome.org/projects/gconf/) or the mailing list archives for more information (http://mail.gnome.org) about this problem."), key_name); dialog = gnomemeeting_error_dialog (GTK_WINDOW (main_window), - _("Gconf key error"), msg); + _("Gconf key error"), "%s", msg); g_signal_handlers_disconnect_by_func (G_OBJECT (dialog), (gpointer) gtk_widget_destroy, --- ekiga-2.0.5/src/gui/chat.h.format-string 2007-02-13 15:28:57.000000000 -0500 +++ ekiga-2.0.5/src/gui/chat.h 2007-03-06 17:48:30.000000000 -0500 @@ -115,7 +115,7 @@ void gm_chat_window_push_info_message (GtkWidget *chat_window, const char *url, const char *msg, - ...); + ...) G_GNUC_PRINTF(3,4); G_END_DECLS --- ekiga-2.0.5/src/gui/history.h.format-string 2007-02-13 15:28:57.000000000 -0500 +++ ekiga-2.0.5/src/gui/history.h 2007-03-06 17:48:30.000000000 -0500 @@ -55,6 +55,6 @@ void gm_history_window_insert (GtkWidget *log_window, const char *format, - ...); + ...) G_GNUC_PRINTF(2,3); #endif /* _LOG_WINDOW_H_ */ --- ekiga-2.0.5/src/gui/main.h.format-string 2007-02-13 15:28:57.000000000 -0500 +++ ekiga-2.0.5/src/gui/main.h 2007-03-06 17:48:30.000000000 -0500 @@ -338,7 +338,7 @@ */ void gm_main_window_flash_message (GtkWidget *main_window, const char *msg, - ...); + ...) G_GNUC_PRINTF(2,3); /* DESCRIPTION : / @@ -359,7 +359,7 @@ */ void gm_main_window_push_message (GtkWidget *main_window, const char *msg, - ...); + ...) G_GNUC_PRINTF(2,3); /* DESCRIPTION : / @@ -369,7 +369,7 @@ */ void gm_main_window_push_info_message (GtkWidget *main_window, const char *msg, - ...); + ...) G_GNUC_PRINTF(2,3); /* DESCRIPTION : / * BEHAVIOR : Sets the given URL as called URL. --- ekiga-2.0.5/src/gui/misc.cpp.format-string 2007-02-13 15:28:57.000000000 -0500 +++ ekiga-2.0.5/src/gui/misc.cpp 2007-03-06 17:48:30.000000000 -0500 @@ -113,7 +113,7 @@ gdk_threads_enter (); gnomemeeting_error_dialog (GTK_WINDOW (main_window), _("Error"), - (gchar *) data); + "%s", (gchar *) data); gdk_threads_leave (); return FALSE; --- ekiga-2.0.5/src/gui/accounts.cpp.format-string 2007-02-13 15:28:57.000000000 -0500 +++ ekiga-2.0.5/src/gui/accounts.cpp 2007-03-06 17:48:30.000000000 -0500 @@ -718,7 +718,7 @@ dialog = gtk_message_dialog_new (GTK_WINDOW (accounts_window), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, confirm_msg); + GTK_BUTTONS_YES_NO, "%s", confirm_msg); g_free (confirm_msg); gtk_dialog_set_default_response (GTK_DIALOG (dialog), --- ekiga-2.0.5/src/devices/videoinput.cpp.format-string 2007-02-13 15:28:56.000000000 -0500 +++ ekiga-2.0.5/src/devices/videoinput.cpp 2007-03-06 17:48:30.000000000 -0500 @@ -392,7 +392,7 @@ gnomemeeting_warning_dialog_on_widget (GTK_WINDOW (main_window), VIDEO_DEVICES_KEY "enable_preview", dialog_title, - dialog_msg); + "%s", dialog_msg); g_free (dialog_msg); g_free (dialog_title); g_free (tmp_msg); @@ -706,7 +706,7 @@ gdk_threads_enter (); gnomemeeting_error_dialog (GTK_WINDOW (druid_window), _("Failed to open the device"), - dialog_msg); + "%s", dialog_msg); gdk_threads_leave (); g_free (dialog_msg); --- ekiga-2.0.5/src/endpoints/sip.cpp.format-string 2007-02-13 15:28:56.000000000 -0500 +++ ekiga-2.0.5/src/endpoints/sip.cpp 2007-03-06 17:49:19.000000000 -0500 @@ -248,7 +248,7 @@ wasRegistering); #endif - gm_history_window_insert (history_window, msg); + gm_history_window_insert (history_window, "%s", msg); gm_main_window_flash_message (main_window, "%s", msg); if (endpoint.GetCallingState() == GMManager::Standby) gm_main_window_set_account_info (main_window, @@ -341,8 +341,8 @@ NULL); } - gm_history_window_insert (history_window, msg); - gm_main_window_push_message (main_window, msg); + gm_history_window_insert (history_window, "%s", msg); + gm_main_window_push_message (main_window, "%s", msg); gnomemeeting_threads_leave (); /* Signal the SIP Endpoint */ --- ekiga-2.0.5/src/endpoints/manager.cpp.format-string 2007-02-13 15:28:56.000000000 -0500 +++ ekiga-2.0.5/src/endpoints/manager.cpp 2007-03-06 17:51:54.000000000 -0500 @@ -672,7 +672,7 @@ msg = g_strdup_printf (_("Forwarding call to %s"), (const char*) forward_party); gm_main_window_flash_message (main_window, "%s", msg); - gm_history_window_insert (history_window, msg); + gm_history_window_insert (history_window, "%s", msg); gnomemeeting_threads_leave (); g_free (msg); @@ -827,7 +827,7 @@ gnomemeeting_threads_enter (); gm_main_window_flash_message (main_window, "%s", msg); gm_chat_window_push_info_message (chat_window, NULL, msg); - gm_history_window_insert (history_window, msg); + gm_history_window_insert (history_window, "%s", msg); gnomemeeting_threads_leave (); g_free (msg); @@ -867,7 +867,7 @@ if (short_reason) gm_main_window_flash_message (main_window, "%s", short_reason); if (long_reason) - gm_history_window_insert (history_window, long_reason); + gm_history_window_insert (history_window, "%s", long_reason); gnomemeeting_threads_leave (); /* Update the current state if action is 0 or 4. @@ -1289,7 +1289,7 @@ t.AsString (0), msg_reason, utf8_app); - gm_history_window_insert (history_window, msg_reason); + gm_history_window_insert (history_window, "%s", msg_reason); gm_main_window_flash_message (main_window, "%s", msg_reason); gm_chat_window_push_info_message (chat_window, NULL, ""); gnomemeeting_threads_leave (); @@ -1913,7 +1913,7 @@ /* Update the GUI and menus wrt opened channels */ gnomemeeting_threads_enter (); - gm_history_window_insert (history_window, msg); + gm_history_window_insert (history_window, "%s", msg); gm_main_window_update_sensitivity (main_window, is_video, is_video?is_receiving_video:is_receiving_audio, is_video?is_transmitting_video:is_transmitting_audio); gm_main_window_set_channel_pause (main_window, FALSE, is_video); gm_main_window_set_call_info (main_window, @@ -2114,7 +2114,7 @@ gdk_threads_enter (); - gm_main_window_push_info_message (main_window, msg); + gm_main_window_push_info_message (main_window, "%s", msg); gm_main_window_update_stats (main_window, lost_packets_per, late_packets_per, --- ekiga-2.0.5/src/endpoints/urlhandler.cpp.format-string 2007-02-13 15:28:56.000000000 -0500 +++ ekiga-2.0.5/src/endpoints/urlhandler.cpp 2007-03-06 17:48:30.000000000 -0500 @@ -471,8 +471,8 @@ else msg = g_strdup_printf (_("Transferring call to %s"), (const char *) call_address); - gm_history_window_insert (history_window, msg); - gm_main_window_push_message (main_window, msg); + gm_history_window_insert (history_window, "%s", msg); + gm_main_window_push_message (main_window, "%s", msg); g_free (msg); } gnomemeeting_threads_leave (); --- ekiga-2.0.5/src/endpoints/accountshandler.cpp.format-string 2007-02-13 15:28:56.000000000 -0500 +++ ekiga-2.0.5/src/endpoints/accountshandler.cpp 2007-03-06 17:48:30.000000000 -0500 @@ -202,8 +202,8 @@ a->host?a->host:""); gnomemeeting_threads_enter (); - gm_main_window_push_message (main_window, msg); - gm_history_window_insert (history_window, msg); + gm_main_window_push_message (main_window, "%s", msg); + gm_history_window_insert (history_window, "%s", msg); gm_accounts_window_update_account_state (accounts_window, FALSE, a->host, @@ -312,8 +312,8 @@ msg = g_strdup_printf (_("Registered to %s"), a->host); gnomemeeting_threads_enter (); - gm_main_window_push_message (main_window, msg); - gm_history_window_insert (history_window, msg); + gm_main_window_push_message (main_window, "%s", msg); + gm_history_window_insert (history_window, "%s", msg); gm_accounts_window_update_account_state (accounts_window, FALSE, a->host, @@ -343,8 +343,8 @@ h323EP->RemoveAliasName (a->username); gnomemeeting_threads_enter (); - gm_main_window_push_message (main_window, msg); - gm_history_window_insert (history_window, msg); + gm_main_window_push_message (main_window, "%s", msg); + gm_history_window_insert (history_window, "%s", msg); gm_accounts_window_update_account_state (accounts_window, FALSE, a->host, --- ekiga-2.0.5/lib/gui/gmstatusbar.c.format-string 2007-02-13 15:29:05.000000000 -0500 +++ ekiga-2.0.5/lib/gui/gmstatusbar.c 2007-03-06 17:48:30.000000000 -0500 @@ -47,8 +47,8 @@ static void gm_sb_push_message (GmStatusbar *, gboolean, gboolean, - const char *, - ...); + const char *, + va_list args); static int gm_statusbar_clear_msg_cb (gpointer); @@ -100,7 +100,7 @@ gboolean flash_message, gboolean info_message, const char *msg, - ...) + va_list args) { gint id = 0; gint msg_id = 0; @@ -120,16 +120,12 @@ if (msg) { - va_list args; char buffer [1025]; - va_start (args, msg); vsnprintf (buffer, 1024, msg, args); msg_id = gtk_statusbar_push (GTK_STATUSBAR (sb), id, buffer); - va_end (args); - if (flash_message) gtk_timeout_add (15000, gm_statusbar_clear_msg_cb, GINT_TO_POINTER (msg_id)); --- ekiga-2.0.5/lib/gui/gmstatusbar.h.format-string 2007-02-13 15:29:05.000000000 -0500 +++ ekiga-2.0.5/lib/gui/gmstatusbar.h 2007-03-06 17:48:30.000000000 -0500 @@ -94,7 +94,7 @@ */ void gm_statusbar_flash_message (GmStatusbar *, const char *msg, - ...); + ...) G_GNUC_PRINTF(2,3); /* DESCRIPTION : / @@ -105,7 +105,7 @@ */ void gm_statusbar_push_message (GmStatusbar *, const char *msg, - ...); + ...) G_GNUC_PRINTF(2,3); /* DESCRIPTION : / @@ -116,7 +116,7 @@ */ void gm_statusbar_push_info_message (GmStatusbar *, const char *msg, - ...); + ...) G_GNUC_PRINTF(2,3); G_END_DECLS --- ekiga-2.0.5/lib/gui/gmdialog.h.format-string 2007-02-13 15:29:05.000000000 -0500 +++ ekiga-2.0.5/lib/gui/gmdialog.h 2007-03-06 17:48:30.000000000 -0500 @@ -127,7 +127,7 @@ const char *, const char *, const char *, - ...); + ...) G_GNUC_PRINTF(4,5); /** @@ -140,7 +140,7 @@ GtkWidget *gnomemeeting_error_dialog (GtkWindow *parent, const char *, const char *format, - ...); + ...) G_GNUC_PRINTF(3,4); /** @@ -153,7 +153,7 @@ GtkWidget *gnomemeeting_warning_dialog (GtkWindow *parent, const char *, const char *format, - ...); + ...) G_GNUC_PRINTF(3,4); /** @@ -166,7 +166,7 @@ GtkWidget *gnomemeeting_message_dialog (GtkWindow *parent, const char *, const char *format, - ...); + ...) G_GNUC_PRINTF(3,4); /** @@ -179,7 +179,7 @@ GtkWidget *gnomemeeting_progress_dialog (GtkWindow *parent, const char *, const char *format, - ...); + ...) G_GNUC_PRINTF(3,4); G_END_DECLS Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/FC-6/ekiga.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ekiga.spec 21 Feb 2007 01:45:24 -0000 1.31 +++ ekiga.spec 6 Mar 2007 23:17:23 -0000 1.32 @@ -1,11 +1,12 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga Version: 2.0.5 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.ekiga.org/ Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz # fixed in upstream cvs Patch1: ekiga-2.0.2-transparent.patch +Patch2: ekiga-2.0.2-format-string.patch License: GPL Group: Applications/Communications BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -48,9 +49,11 @@ %prep %setup -q %patch1 -p1 -b .transparent +%patch2 -p1 -b .format-string %build -CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC" +CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC -Wformat-nonliteral" +CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC -Wformat-nonliteral" # We disable howl for now, waiting for ekiga 2.0 to ship with avahi support %configure --disable-scrollkeeper make @@ -96,6 +99,11 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Tue Mar 06 2007 Soren Sandmann - 2.0.5-3 +- Add -Wnon-literal +- ekiga-2.0.2-format-string.patch - add G_GNUC_PRINTF annotations and + fix the resulting warnings. + * Tue Feb 20 2007 Soren Sandmann - 2.0.5-2 - Rebuild From fedora-cvs-commits at redhat.com Tue Mar 6 23:26:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 18:26:55 -0500 Subject: rpms/esc/devel sources,1.2,1.3 Message-ID: <200703062326.l26NQtPX003124@cvs.devel.redhat.com> Author: jmagne Update of /cvs/dist/rpms/esc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2729 Modified Files: sources Log Message: Addd new esc tar ball. Index: sources =================================================================== RCS file: /cvs/dist/rpms/esc/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jul 2006 18:18:54 -0000 1.2 +++ sources 6 Mar 2007 23:26:52 -0000 1.3 @@ -1,2 +1,3 @@ a344ae0baa8ec2f1e5d916c2df7f7d3c esc-1.0.0.tar.bz2 d60ccb6cc28afa7d880c8602a2c88450 xulrunner-1.8.0.1-source.tar.bz2 +3d3def2acd3c8d04dff47af5312a707c esc-1.0.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 6 23:33:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 18:33:04 -0500 Subject: rpms/esc/devel sources,1.3,1.4 Message-ID: <200703062333.l26NX4Hw015670@cvs.devel.redhat.com> Author: jmagne Update of /cvs/dist/rpms/esc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15617 Modified Files: sources Log Message: Add new xulrunner tarball. Index: sources =================================================================== RCS file: /cvs/dist/rpms/esc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2007 23:26:52 -0000 1.3 +++ sources 6 Mar 2007 23:32:52 -0000 1.4 @@ -1,3 +1,4 @@ a344ae0baa8ec2f1e5d916c2df7f7d3c esc-1.0.0.tar.bz2 d60ccb6cc28afa7d880c8602a2c88450 xulrunner-1.8.0.1-source.tar.bz2 3d3def2acd3c8d04dff47af5312a707c esc-1.0.1.tar.bz2 +4dc09831aa4e94fda5182a4897ed08e9 xulrunner-1.8.0.4-source.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 6 23:35:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 18:35:10 -0500 Subject: rpms/esc/devel esc,1.3,1.4 Message-ID: <200703062335.l26NZA7Z015877@cvs.devel.redhat.com> Author: jmagne Update of /cvs/dist/rpms/esc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15815 Modified Files: esc Log Message: Update to ver 1.0.1. Index: esc =================================================================== RCS file: /cvs/dist/rpms/esc/devel/esc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- esc 23 Sep 2006 01:08:13 -0000 1.3 +++ esc 6 Mar 2007 23:34:54 -0000 1.4 @@ -1,9 +1,26 @@ #!/bin/sh +# +# BEGIN COPYRIGHT BLOCK +# 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. +# +# 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. +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK ESC_PROFILE_BASE=~/.redhat/esc ESC_LOG_FILE=esc.log -ESC_PATH=$LIBDIR/esc-1.0.0 +ESC_PATH=$LIBDIR/esc-1.0.1 ESC_BIN_PATH=/usr/bin ESC_EXEC=esc ESCD_EXEC=escd From fedora-cvs-commits at redhat.com Tue Mar 6 23:38:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 18:38:14 -0500 Subject: rpms/esc/devel esc.spec,1.23,1.24 Message-ID: <200703062338.l26NcEfL016171@cvs.devel.redhat.com> Author: jmagne Update of /cvs/dist/rpms/esc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16145 Modified Files: esc.spec Log Message: Update to ver 1.0.1. Index: esc.spec =================================================================== RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- esc.spec 27 Oct 2006 18:33:36 -0000 1.23 +++ esc.spec 6 Mar 2007 23:38:11 -0000 1.24 @@ -1,6 +1,6 @@ Name: esc -Version: 1.0.0 -Release: 19%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Enterprise Security Client Smart Card Client License: GPL URL: http://directory.fedora.redhat.com/wiki/CoolKey @@ -8,24 +8,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: firefox-1.5.0.1-dumpstack.patch -Patch2: xulrunner-1.8.0.1-coreconf.patch -Patch3: firefox-1.5-with-system-nss.patch -Patch4: firefox-1.1-nss-system-nspr.patch -Patch5: esc-1.0.0-xul-sys-nss-nspr.patch -Patch6: esc-1.0.0-ui-enhance.patch -Patch7: esc-1.0.0-notify-icon-fixes.patch -Patch8: esc-1.0.0-strings-fix.patch -Patch11: esc-1.0.0.strings-1-fix.patch -Patch12: esc-1.0.0-ui-enhance-1.patch -Patch13: esc-1.0.0-pw-reset-fix.patch -Patch14: esc-1.0.0-escd.patch -Patch15: esc-1.0.0-escd1.patch -Patch16: esc-1.0.0-escd2.patch -Patch17: esc-1.0.0-build-fix.patch -Patch18: esc-1.0.0-diag-fix.patch -Patch19: esc-1.0.0-mac-win-fix.patch -Patch20: esc-1.0.0-mac-win-fix1.patch +Patch1: firefox-1.5-with-system-nss.patch +Patch2: firefox-1.1-nss-system-nspr.patch BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel @@ -63,7 +47,7 @@ Source0: %{escname}.tar.bz2 Source1: esc Source2: esc.desktop -Source3: xulrunner-1.8.0.1-source.tar.bz2 +Source3: xulrunner-1.8.0.4-source.tar.bz2 %description @@ -74,22 +58,7 @@ %setup -q -c -n %{escname} -#patch esc to use system nss and nspr. -%patch5 -p1 -b .fix5 -%patch6 -p1 -b .fix6 -%patch7 -p1 -b .fix7 -%patch8 -p1 -b .fix8 -%patch11 -p1 -b .fix11 -%patch12 -p1 -b .fix12 -%patch13 -p1 -b .fix13 -%patch14 -p1 -b .fix14 -%patch15 -p1 -b .fix15 -%patch16 -p1 -b .fix16 -%patch17 -p1 -b .fix17 -%patch18 -p1 -b .fix18 -%patch19 -p1 -b .fix19 -%patch20 -p1 -b .fix20 #Unpack xulrunner where esc expects it to be. @@ -101,8 +70,6 @@ %patch1 -p1 -b .fix1 %patch2 -p1 -b .fix2 -%patch3 -p1 -b .fix3 -%patch4 -p1 -b .fix4 %build @@ -132,6 +99,7 @@ sed -e 's;\$LIBDIR;'%{_libdir}';g' %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name} + chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc mkdir -p $RPM_BUILD_ROOT/%{escdir} @@ -198,6 +166,8 @@ fi %changelog +* Mon Mar 05 2007 Jack Magne - 1.0.0-1 +- Stability fixes * Fri Oct 27 2006 Jack Magne - 1.0.0-19 - More mac and win fixes. * Tue Oct 24 2006 Jack Magne - 1.0.0-18 From fedora-cvs-commits at redhat.com Tue Mar 6 23:44:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 18:44:33 -0500 Subject: rpms/esc/devel .cvsignore,1.2,1.3 Message-ID: <200703062344.l26NiXZV017927@cvs.devel.redhat.com> Author: jmagne Update of /cvs/dist/rpms/esc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17859 Modified Files: .cvsignore Log Message: Added new tar balls. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/esc/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jul 2006 18:18:54 -0000 1.2 +++ .cvsignore 6 Mar 2007 23:44:30 -0000 1.3 @@ -1,2 +1,4 @@ esc-1.0.0.tar.bz2 xulrunner-1.8.0.1-source.tar.bz2 +esc-1.0.1.tar.bz2 +xulrunner-1.8.0.4-source.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 7 00:39:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 19:39:35 -0500 Subject: rpms/spamassassin/devel spamassassin.spec,1.88,1.89 Message-ID: <200703070039.l270dZWC004336@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4276 Modified Files: spamassassin.spec Log Message: Conditional to require perl-devel during build for FC7+ (#226276) Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- spamassassin.spec 2 Mar 2007 19:10:34 -0000 1.88 +++ spamassassin.spec 7 Mar 2007 00:39:33 -0000 1.89 @@ -2,6 +2,8 @@ %define option_ssl 1 # OPTION: perl-Archive-Tar (FC2+, RHEL5+) %define option_archive_tar 1 +# OPTION: Split perl-devel (FC7+) +%define perl-devel 1 # DEPRECATED OPTION: Old krb5.h location (RHEL3 and old FC) %define option_old_krb5 0 @@ -15,7 +17,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.2.0 -Release: 0.1.%{pre}%{?dist} +Release: 0.2.%{pre}%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -61,6 +63,9 @@ # Needed for IPv6 Requires: perl(IO::Socket::INET6) %endif +%if %{perl_devel} +BuildRequires: perl-devel +%endif Obsoletes: perl-Mail-SpamAssassin @@ -187,6 +192,9 @@ exit 0 %changelog +* Tue Mar 06 2007 Warren Togami 3.2.0-0.2.pre2 +- Conditional to require perl-devel during build for FC7+ (#226276) + * Fri Mar 02 2007 Warren Togami 3.2.0-0.1.pre2 - 3.2.0-pre2 From fedora-cvs-commits at redhat.com Wed Mar 7 00:40:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 19:40:15 -0500 Subject: rpms/spamassassin/devel spamassassin.spec,1.89,1.90 Message-ID: <200703070040.l270eFKQ004842@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4779 Modified Files: spamassassin.spec Log Message: fix typo Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- spamassassin.spec 7 Mar 2007 00:39:33 -0000 1.89 +++ spamassassin.spec 7 Mar 2007 00:40:09 -0000 1.90 @@ -63,7 +63,7 @@ # Needed for IPv6 Requires: perl(IO::Socket::INET6) %endif -%if %{perl_devel} +%if %{perl-devel} BuildRequires: perl-devel %endif From fedora-cvs-commits at redhat.com Wed Mar 7 00:41:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 19:41:27 -0500 Subject: rpms/spamassassin/devel spamassassin.spec,1.90,1.91 Message-ID: <200703070041.l270fQ4P000597@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27440 Modified Files: spamassassin.spec Log Message: hmm, spec files don't like dashes in defines? Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- spamassassin.spec 7 Mar 2007 00:40:09 -0000 1.90 +++ spamassassin.spec 7 Mar 2007 00:41:24 -0000 1.91 @@ -3,7 +3,7 @@ # OPTION: perl-Archive-Tar (FC2+, RHEL5+) %define option_archive_tar 1 # OPTION: Split perl-devel (FC7+) -%define perl-devel 1 +%define perl_devel 1 # DEPRECATED OPTION: Old krb5.h location (RHEL3 and old FC) %define option_old_krb5 0 @@ -63,7 +63,7 @@ # Needed for IPv6 Requires: perl(IO::Socket::INET6) %endif -%if %{perl-devel} +%if %{perl_devel} BuildRequires: perl-devel %endif From fedora-cvs-commits at redhat.com Wed Mar 7 01:17:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 20:17:37 -0500 Subject: rpms/ekiga/FC-5 ekiga.spec,1.21,1.22 format-string.patch,1.1,1.2 Message-ID: <200703070117.l271Hbjq009643@cvs.devel.redhat.com> Author: sandmann Update of /cvs/dist/rpms/ekiga/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv9143 Modified Files: ekiga.spec format-string.patch Log Message: More format string issues Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/FC-5/ekiga.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ekiga.spec 21 Feb 2007 01:28:37 -0000 1.21 +++ ekiga.spec 7 Mar 2007 01:17:35 -0000 1.22 @@ -1,7 +1,7 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga Version: 2.0.1 -Release: 4 +Release: 5 URL: http://www.ekiga.org/ Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz License: GPL @@ -92,6 +92,9 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Mon Mar 6 2007 Soren Sandmann - 2.0.1-5 +- fix additional formatting string issues - bug 229259 + * Mon Feb 19 2007 Soren Sandmann - 2.0.1-4 - fix formatting strings - bug 229259 format-string.patch: manager.cpp | 8 ++++---- urlhandler.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) Index: format-string.patch =================================================================== RCS file: /cvs/dist/rpms/ekiga/FC-5/format-string.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- format-string.patch 20 Feb 2007 00:05:13 -0000 1.1 +++ format-string.patch 7 Mar 2007 01:17:35 -0000 1.2 @@ -1,6 +1,6 @@ ---- ekiga-2.0.1/src/endpoints/manager.cpp.format-string 2007-02-19 17:10:24.000000000 -0500 -+++ ekiga-2.0.1/src/endpoints/manager.cpp 2007-02-19 17:15:11.000000000 -0500 -@@ -664,7 +664,7 @@ +--- ekiga-2.0.2/src/endpoints/manager.cpp.format-string 2006-05-13 16:37:14.000000000 -0400 ++++ ekiga-2.0.2/src/endpoints/manager.cpp 2007-02-28 19:03:22.000000000 -0500 +@@ -660,7 +660,7 @@ gnomemeeting_threads_enter (); msg = g_strdup_printf (_("Forwarding call to %s"), (const char*) forward_party); @@ -9,7 +9,7 @@ gm_history_window_insert (history_window, msg); gnomemeeting_threads_leave (); g_free (msg); -@@ -818,7 +818,7 @@ +@@ -814,7 +814,7 @@ /* Update the log and status bar */ msg = g_strdup_printf (_("Call from %s"), (const char *) utf8_name); gnomemeeting_threads_enter (); @@ -18,7 +18,7 @@ gm_chat_window_push_info_message (chat_window, NULL, msg); gm_history_window_insert (history_window, msg); gnomemeeting_threads_leave (); -@@ -858,9 +858,9 @@ +@@ -854,9 +854,9 @@ /* Display the action message */ gnomemeeting_threads_enter (); if (short_reason) @@ -30,9 +30,9 @@ gnomemeeting_threads_leave (); /* Update the current state and show popup if action is 1 */ ---- ekiga-2.0.1/src/endpoints/urlhandler.cpp.format-string 2007-02-19 17:08:55.000000000 -0500 -+++ ekiga-2.0.1/src/endpoints/urlhandler.cpp 2007-02-19 17:10:08.000000000 -0500 -@@ -565,7 +565,7 @@ +--- ekiga-2.0.2/src/endpoints/urlhandler.cpp.format-string 2006-05-17 16:32:32.000000000 -0400 ++++ ekiga-2.0.2/src/endpoints/urlhandler.cpp 2007-02-28 19:03:22.000000000 -0500 +@@ -527,7 +527,7 @@ if (call_address.Find ("+type=directory") != P_MAX_INDEX) { @@ -41,7 +41,7 @@ gm_calls_history_add_call (PLACED_CALL, NULL, call_address, -@@ -576,7 +576,7 @@ +@@ -538,7 +538,7 @@ } else { From fedora-cvs-commits at redhat.com Wed Mar 7 03:05:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 22:05:07 -0500 Subject: rpms/nspr/devel nspr-ipv6-numerichost.patch,1.2,1.3 Message-ID: <200703070305.l27357eY025401@cvs.devel.redhat.com> Author: kengert Update of /cvs/dist/rpms/nspr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25380 Modified Files: nspr-ipv6-numerichost.patch Log Message: Adjust IPv6 patch to latest upstream version nspr-ipv6-numerichost.patch: include/md/_win95.h | 2 include/md/_winnt.h | 2 src/misc/prnetdb.c | 312 ++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 220 insertions(+), 96 deletions(-) Index: nspr-ipv6-numerichost.patch =================================================================== RCS file: /cvs/dist/rpms/nspr/devel/nspr-ipv6-numerichost.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nspr-ipv6-numerichost.patch 24 Feb 2007 08:29:22 -0000 1.2 +++ nspr-ipv6-numerichost.patch 7 Mar 2007 03:05:05 -0000 1.3 @@ -1,11 +1,10 @@ -? mozilla/nsprpub/pr/tests/detach.c Index: mozilla/nsprpub/pr/include/md/_win95.h =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_win95.h,v retrieving revision 3.30.2.1 diff -u -r3.30.2.1 _win95.h --- mozilla/nsprpub/pr/include/md/_win95.h 5 Apr 2006 21:51:23 -0000 3.30.2.1 -+++ mozilla/nsprpub/pr/include/md/_win95.h 20 Feb 2007 20:51:07 -0000 ++++ mozilla/nsprpub/pr/include/md/_win95.h 22 Feb 2007 02:14:52 -0000 @@ -61,6 +61,8 @@ /* newer ws2tcpip.h provides these */ #ifndef AI_CANONNAME @@ -21,7 +20,7 @@ retrieving revision 3.30 diff -u -r3.30 _winnt.h --- mozilla/nsprpub/pr/include/md/_winnt.h 20 Jun 2005 22:05:20 -0000 3.30 -+++ mozilla/nsprpub/pr/include/md/_winnt.h 20 Feb 2007 20:51:07 -0000 ++++ mozilla/nsprpub/pr/include/md/_winnt.h 22 Feb 2007 02:14:52 -0000 @@ -76,6 +76,8 @@ /* newer ws2tcpip.h provides these */ #ifndef AI_CANONNAME @@ -37,68 +36,39 @@ retrieving revision 3.47.2.1 diff -u -r3.47.2.1 prnetdb.c --- mozilla/nsprpub/pr/src/misc/prnetdb.c 14 Nov 2006 17:41:59 -0000 3.47.2.1 -+++ mozilla/nsprpub/pr/src/misc/prnetdb.c 20 Feb 2007 20:51:08 -0000 -@@ -39,6 +39,8 @@ ++++ mozilla/nsprpub/pr/src/misc/prnetdb.c 22 Feb 2007 02:14:52 -0000 +@@ -1772,99 +1772,6 @@ - #include + #endif /* !_PR_HAVE_INET_NTOP */ -+#define PR_AI_NUMERICHOST 0x4000 /* for internal use only */ -+ - /* - * On Unix, the error code for gethostbyname() and gethostbyaddr() - * is returned in the global variable h_errno, instead of the usual -@@ -1775,63 +1777,70 @@ - PR_IMPLEMENT(PRStatus) PR_StringToNetAddr(const char *string, PRNetAddr *addr) - { - PRStatus status = PR_SUCCESS; +-PR_IMPLEMENT(PRStatus) PR_StringToNetAddr(const char *string, PRNetAddr *addr) +-{ +- PRStatus status = PR_SUCCESS; - PRIntn rv; -+ PRAddrInfo *infop = NULL; -+ PRNetAddr laddr; - +- -#if defined(_PR_HAVE_INET_NTOP) - rv = inet_pton(AF_INET6, string, &addr->ipv6.ip); - if (1 == rv) -+ if (NULL == addr) - { +- { - addr->raw.family = PR_AF_INET6; -+ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); -+ return PR_FAILURE; - } +- } - else -+ infop = PR_GetAddrInfoByName(string, PR_AF_UNSPEC, -+ PR_AI_NUMERICHOST|PR_AI_ADDRCONFIG); -+ if (NULL == infop) -+ { -+ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); -+ return PR_FAILURE; -+ } -+ if (PR_EnumerateAddrInfo(NULL, infop, 0, &laddr) != NULL) - { +- { - PR_ASSERT(0 == rv); - /* clean up after the failed inet_pton() call */ - memset(&addr->ipv6.ip, 0, sizeof(addr->ipv6.ip)); - rv = inet_pton(AF_INET, string, &addr->inet.ip); - if (1 == rv) -+ /* pick up the first addr */ -+ if (PR_AF_INET6 == laddr.raw.family) -+ { -+ addr->ipv6.family = laddr.ipv6.family; -+ addr->ipv6.ip = laddr.ipv6.ip; -+ addr->ipv6.scope_id = laddr.ipv6.scope_id; -+ } -+ else if (PR_AF_INET == laddr.raw.family) - { +- { - addr->raw.family = AF_INET; -+ addr->inet.family = laddr.inet.family; -+ addr->inet.ip = laddr.inet.ip; - } - else - { +- } +- else +- { - PR_ASSERT(0 == rv); - PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); - status = PR_FAILURE; - } - } +- PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); +- status = PR_FAILURE; +- } +- } -#else /* _PR_HAVE_INET_NTOP */ - rv = StringToV6Addr(string, &addr->ipv6.ip); - if (1 == rv) { @@ -116,53 +86,58 @@ - addr->inet.ip = inet_addr(string); -#endif - if ((PRUint32) -1 == addr->inet.ip) -+ else - { +- { - /* - * The string argument is a malformed address string. - */ - PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); - status = PR_FAILURE; - } +- PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); +- status = PR_FAILURE; +- } -#endif /* _PR_HAVE_INET_NTOP */ - -+ PR_FreeAddrInfo(infop); - return status; - } - -+static int -+pr_GetNameInfo(const PRNetAddr *addr, size_t addrlen, -+ char *host, size_t hostlen, -+ char *serv, size_t servlen, PRIntn flags); -+ - PR_IMPLEMENT(PRStatus) PR_NetAddrToString( - const PRNetAddr *addr, char *string, PRUint32 size) - { -+#if defined(_PR_HAVE_GETADDRINFO) -+ PRIntn rv = 0; -+ size_t addrlen = 0; -+ -+ if (NULL == string || 0 == size) -+ goto failed; -+ addrlen = PR_NETADDR_SIZE(addr); -+ rv = pr_GetNameInfo(addr, addrlen, string, size, NULL, 0, NI_NUMERICHOST); -+ if (rv != 0) -+ goto failed; -+ return PR_SUCCESS; -+#else - if (PR_AF_INET6 == addr->raw.family) - { - #if defined(_PR_HAVE_INET_NTOP) -@@ -1858,7 +1867,7 @@ - } - - return PR_SUCCESS; +- return status; +-} - -+#endif - failed: - PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); - return PR_FAILURE; -@@ -1947,6 +1956,7 @@ +-PR_IMPLEMENT(PRStatus) PR_NetAddrToString( +- const PRNetAddr *addr, char *string, PRUint32 size) +-{ +- if (PR_AF_INET6 == addr->raw.family) +- { +-#if defined(_PR_HAVE_INET_NTOP) +- if (NULL == inet_ntop(AF_INET6, &addr->ipv6.ip, string, size)) +-#else +- if (NULL == V6AddrToString(&addr->ipv6.ip, string, size)) +-#endif +- { +- /* the size of the result buffer is inadequate */ +- PR_SetError(PR_BUFFER_OVERFLOW_ERROR, 0); +- return PR_FAILURE; +- } +- } +- else +- { +- if (size < 16) goto failed; +- if (AF_INET != addr->raw.family) goto failed; +- else +- { +- unsigned char *byte = (unsigned char*)&addr->inet.ip; +- PR_snprintf(string, size, "%u.%u.%u.%u", +- byte[0], byte[1], byte[2], byte[3]); +- } +- } +- +- return PR_SUCCESS; +- +-failed: +- PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); +- return PR_FAILURE; +- +-} /* PR_NetAddrToString */ +- + /* + * Convert an IPv4 addr to an (IPv4-mapped) IPv6 addr + */ +@@ -1947,12 +1854,13 @@ typedef struct addrinfo PRADDRINFO; #define GETADDRINFO getaddrinfo #define FREEADDRINFO freeaddrinfo @@ -170,7 +145,14 @@ #elif defined(_PR_INET6_PROBE) -@@ -1965,17 +1975,24 @@ + typedef struct addrinfo PRADDRINFO; + +-/* getaddrinfo/freeaddrinfo prototypes */ ++/* getaddrinfo/freeaddrinfo/getnameinfo prototypes */ + #if defined(WIN32) + #define FUNC_MODIFIER __stdcall + #else +@@ -1965,17 +1873,24 @@ PRADDRINFO **res); typedef int (FUNC_MODIFIER * FN_FREEADDRINFO) (PRADDRINFO *ai); @@ -195,33 +177,33 @@ #endif PRStatus -@@ -2003,6 +2020,12 @@ - PR_UnloadLibrary(lib); - continue; +@@ -2005,7 +1920,12 @@ } + _pr_freeaddrinfo = (FN_FREEADDRINFO) + PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL); +- PR_ASSERT(_pr_freeaddrinfo); + _pr_getnameinfo = (FN_GETNAMEINFO) + PR_FindFunctionSymbol(lib, GETNAMEINFO_SYMBOL); -+ if (!_pr_getnameinfo) { ++ if (!_pr_freeaddrinfo || !_pr_getnameinfo) { + PR_UnloadLibrary(lib); + continue; + } - _pr_freeaddrinfo = (FN_FREEADDRINFO) - PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL); - PR_ASSERT(_pr_freeaddrinfo); -@@ -2020,6 +2043,12 @@ - if (!_pr_getaddrinfo) { - return PR_FAILURE; + /* Keep the library loaded. */ + return PR_SUCCESS; + } +@@ -2022,8 +1942,10 @@ } -+ _pr_getnameinfo = (FN_GETNAMEINFO) -+ PR_FindFunctionSymbol(lib, GETNAMEINFO_SYMBOL); -+ if (!_pr_getnameinfo) { -+ PR_UnloadLibrary(lib); -+ return PR_FAILURE; -+ } _pr_freeaddrinfo = (FN_FREEADDRINFO) PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL); ++ _pr_getnameinfo = (FN_GETNAMEINFO) ++ PR_FindFunctionSymbol(lib, GETNAMEINFO_SYMBOL); PR_UnloadLibrary(lib); -@@ -2032,6 +2061,7 @@ +- if (!_pr_freeaddrinfo) { ++ if (!_pr_freeaddrinfo || !_pr_getnameinfo) { + return PR_FAILURE; + } + return PR_SUCCESS; +@@ -2032,6 +1954,7 @@ #define GETADDRINFO (*_pr_getaddrinfo) #define FREEADDRINFO (*_pr_freeaddrinfo) @@ -229,104 +211,204 @@ #endif /* _PR_INET6 */ -@@ -2048,6 +2078,46 @@ - PRBool has_cname; - } PRAddrInfoFB; - -+static PRBool -+pr_IsValidNumericHost(const char *string) +@@ -2201,3 +2124,200 @@ + return fb->has_cname ? fb->hostent.h_name : NULL; + #endif + } ++ ++#if defined(_PR_HAVE_GETADDRINFO) ++static PRStatus pr_StringToNetAddrGAI(const char *string, PRNetAddr *addr) ++{ ++ PRADDRINFO *res, hints; ++ int rv; /* 0 for success, or the error code EAI_xxx */ ++ PRNetAddr laddr; ++ PRStatus status = PR_SUCCESS; ++ ++ if (NULL == addr) ++ { ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ return PR_FAILURE; ++ } ++ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_flags = AI_NUMERICHOST; ++ hints.ai_family = AF_UNSPEC; ++ hints.ai_socktype = SOCK_STREAM; ++ ++ rv = GETADDRINFO(string, NULL, &hints, &res); ++ if (rv != 0) ++ { ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, rv); ++ return PR_FAILURE; ++ } ++ ++ /* pick up the first addr */ ++ memcpy(&laddr, res->ai_addr, res->ai_addrlen); ++ if (AF_INET6 == res->ai_addr->sa_family) ++ { ++ addr->ipv6.family = PR_AF_INET6; ++ addr->ipv6.ip = laddr.ipv6.ip; ++ addr->ipv6.scope_id = laddr.ipv6.scope_id; ++ } ++ else if (AF_INET == res->ai_addr->sa_family) ++ { ++ addr->inet.family = PR_AF_INET; ++ addr->inet.ip = laddr.inet.ip; ++ } ++ else ++ { ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ status = PR_FAILURE; ++ } ++ ++ FREEADDRINFO(res); ++ return status; ++} ++#endif /* _PR_HAVE_GETADDRINFO */ ++ ++#if !defined(_PR_HAVE_GETADDRINFO) || defined(_PR_INET6_PROBE) ++static PRStatus pr_StringToNetAddrFB(const char *string, PRNetAddr *addr) +{ -+ PRNetAddr addr; ++ PRStatus status = PR_SUCCESS; + PRIntn rv; ++ +#if defined(_PR_HAVE_INET_NTOP) -+ rv = inet_pton(AF_INET6, string, &addr.ipv6.ip); -+ if (0 < rv) { -+ return PR_TRUE; ++ rv = inet_pton(AF_INET6, string, &addr->ipv6.ip); ++ if (1 == rv) ++ { ++ addr->raw.family = PR_AF_INET6; + } -+ PR_ASSERT(0 == rv); -+ memset(&addr.ipv6.ip, 0, sizeof(addr.ipv6.ip)); -+ rv = inet_pton(AF_INET, string, &addr.inet.ip); -+ if (0 < rv) { -+ return PR_TRUE; ++ else ++ { ++ PR_ASSERT(0 == rv); ++ /* clean up after the failed inet_pton() call */ ++ memset(&addr->ipv6.ip, 0, sizeof(addr->ipv6.ip)); ++ rv = inet_pton(AF_INET, string, &addr->inet.ip); ++ if (1 == rv) ++ { ++ addr->raw.family = AF_INET; ++ } ++ else ++ { ++ PR_ASSERT(0 == rv); ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ status = PR_FAILURE; ++ } + } -+ return PR_FALSE; +#else /* _PR_HAVE_INET_NTOP */ -+ rv = StringToV6Addr(string, &addr.ipv6.ip); -+ if (0 < rv) { -+ return PR_TRUE; ++ rv = StringToV6Addr(string, &addr->ipv6.ip); ++ if (1 == rv) { ++ addr->raw.family = PR_AF_INET6; ++ return PR_SUCCESS; + } + PR_ASSERT(0 == rv); + /* clean up after the failed StringToV6Addr() call */ -+ memset(&addr.ipv6.ip, 0, sizeof(addr.ipv6.ip)); ++ memset(&addr->ipv6.ip, 0, sizeof(addr->ipv6.ip)); ++ ++ addr->inet.family = AF_INET; +#ifdef XP_OS2_VACPP -+ addr.inet.ip = inet_addr((char *)string); ++ addr->inet.ip = inet_addr((char *)string); +#else -+ addr.inet.ip = inet_addr(string); ++ addr->inet.ip = inet_addr(string); +#endif -+ if ((PRUint32) -1 == addr.inet.ip) { ++ if ((PRUint32) -1 == addr->inet.ip) ++ { + /* + * The string argument is a malformed address string. + */ -+ return PR_FALSE; ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ status = PR_FAILURE; + } -+ return PR_TRUE; ++#endif /* _PR_HAVE_INET_NTOP */ ++ ++ return status; ++} ++#endif /* !_PR_HAVE_GETADDRINFO || _PR_INET6_PROBE */ ++ ++PR_IMPLEMENT(PRStatus) PR_StringToNetAddr(const char *string, PRNetAddr *addr) ++{ ++ if (!_pr_initialized) _PR_ImplicitInitialization(); ++ ++#if !defined(_PR_HAVE_GETADDRINFO) ++ return pr_StringToNetAddrFB(string, addr); ++#else ++#if defined(_PR_INET6_PROBE) ++ if (!_pr_ipv6_is_present) ++ return pr_StringToNetAddrFB(string, addr); ++#endif ++ return pr_StringToNetAddrGAI(string, addr); +#endif +} + - static PRAddrInfo * - pr_GetAddrInfoByNameFB(const char *hostname, - PRUint16 af, -@@ -2055,6 +2125,13 @@ - { - PRStatus rv; - PRAddrInfoFB *ai; -+ -+ if (flags & PR_AI_NUMERICHOST) { -+ if (!pr_IsValidNumericHost(hostname)) { -+ PR_SetError(PR_BAD_ADDRESS_ERROR, 0); -+ return NULL; -+ } ++#if defined(_PR_HAVE_GETADDRINFO) ++static PRStatus pr_NetAddrToStringGNI( ++ const PRNetAddr *addr, char *string, PRUint32 size) ++{ ++ int addrlen; ++ int rv; /* 0 for success, or the error code EAI_xxx */ ++ ++ addrlen = PR_NETADDR_SIZE(addr); ++ rv = GETNAMEINFO((const struct sockaddr *)addr, addrlen, ++ string, size, NULL, 0, NI_NUMERICHOST); ++ if (rv != 0) ++ { ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, rv); ++ return PR_FAILURE; + } - /* fallback on PR_GetHostByName */ - ai = PR_NEW(PRAddrInfoFB); - if (!ai) { -@@ -2077,7 +2154,7 @@ - { - /* restrict input to supported values */ - if ((af != PR_AF_INET && af != PR_AF_UNSPEC) || -- (flags & ~ PR_AI_NOCANONNAME) != PR_AI_ADDRCONFIG) { -+ (flags & ~ (PR_AI_NOCANONNAME|PR_AI_NUMERICHOST)) != PR_AI_ADDRCONFIG) { - PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); - return NULL; - } -@@ -2104,6 +2181,7 @@ - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = (flags & PR_AI_NOCANONNAME) ? 0: AI_CANONNAME; -+ hints.ai_flags |= (flags & PR_AI_NUMERICHOST) ? AI_NUMERICHOST : 0; - hints.ai_family = (af == PR_AF_INET) ? AF_INET : AF_UNSPEC; - - /* -@@ -2139,6 +2217,22 @@ - #endif - } - -+/* -+ * A wrapper function for getnameinfo -+ * Caution: Not implemented for the system that does not have "getnameinfo" -+ */ -+static int -+pr_GetNameInfo(const PRNetAddr *addr, size_t addrlen, -+ char *host, size_t hostlen, -+ char *serv, size_t servlen, PRIntn flags) ++ return PR_SUCCESS; ++} ++#endif /* _PR_HAVE_GETADDRINFO */ ++ ++#if !defined(_PR_HAVE_GETADDRINFO) || defined(_PR_INET6_PROBE) ++static PRStatus pr_NetAddrToStringFB( ++ const PRNetAddr *addr, char *string, PRUint32 size) +{ -+#if defined(_PR_HAVE_GETADDRINFO) -+ return GETNAMEINFO((const struct sockaddr *)addr, addrlen, host, hostlen, serv, servlen, flags); ++ if (PR_AF_INET6 == addr->raw.family) ++ { ++#if defined(_PR_HAVE_INET_NTOP) ++ if (NULL == inet_ntop(AF_INET6, &addr->ipv6.ip, string, size)) +#else -+ return EAI_SYSTEM; /* not implemented */ ++ if (NULL == V6AddrToString(&addr->ipv6.ip, string, size)) +#endif -+} ++ { ++ /* the size of the result buffer is inadequate */ ++ PR_SetError(PR_BUFFER_OVERFLOW_ERROR, 0); ++ return PR_FAILURE; ++ } ++ } ++ else ++ { ++ if (size < 16) goto failed; ++ if (AF_INET != addr->raw.family) goto failed; ++ else ++ { ++ unsigned char *byte = (unsigned char*)&addr->inet.ip; ++ PR_snprintf(string, size, "%u.%u.%u.%u", ++ byte[0], byte[1], byte[2], byte[3]); ++ } ++ } + - PR_IMPLEMENT(void *) PR_EnumerateAddrInfo(void *iterPtr, - const PRAddrInfo *base, - PRUint16 port, ++ return PR_SUCCESS; ++ ++failed: ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ return PR_FAILURE; ++ ++} /* pr_NetAddrToStringFB */ ++#endif /* !_PR_HAVE_GETADDRINFO || _PR_INET6_PROBE */ ++ ++PR_IMPLEMENT(PRStatus) PR_NetAddrToString( ++ const PRNetAddr *addr, char *string, PRUint32 size) ++{ ++ if (!_pr_initialized) _PR_ImplicitInitialization(); ++ ++#if !defined(_PR_HAVE_GETADDRINFO) ++ return pr_NetAddrToStringFB(addr, string, size); ++#else ++#if defined(_PR_INET6_PROBE) ++ if (!_pr_ipv6_is_present) ++ return pr_NetAddrToStringFB(addr, string, size); ++#endif ++ return pr_NetAddrToStringGNI(addr, string, size); ++#endif ++} /* PR_NetAddrToString */ From fedora-cvs-commits at redhat.com Wed Mar 7 03:05:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 6 Mar 2007 22:05:44 -0500 Subject: rpms/nspr/FC-6 nspr-ipv6-numerichost.patch,1.2,1.3 Message-ID: <200703070305.l2735ieC025431@cvs.devel.redhat.com> Author: kengert Update of /cvs/dist/rpms/nspr/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25415 Modified Files: nspr-ipv6-numerichost.patch Log Message: Adjust IPv6 patch to latest upstream version nspr-ipv6-numerichost.patch: include/md/_win95.h | 2 include/md/_winnt.h | 2 src/misc/prnetdb.c | 312 ++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 220 insertions(+), 96 deletions(-) Index: nspr-ipv6-numerichost.patch =================================================================== RCS file: /cvs/dist/rpms/nspr/FC-6/nspr-ipv6-numerichost.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nspr-ipv6-numerichost.patch 24 Feb 2007 08:33:49 -0000 1.2 +++ nspr-ipv6-numerichost.patch 7 Mar 2007 03:05:42 -0000 1.3 @@ -1,11 +1,10 @@ -? mozilla/nsprpub/pr/tests/detach.c Index: mozilla/nsprpub/pr/include/md/_win95.h =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_win95.h,v retrieving revision 3.30.2.1 diff -u -r3.30.2.1 _win95.h --- mozilla/nsprpub/pr/include/md/_win95.h 5 Apr 2006 21:51:23 -0000 3.30.2.1 -+++ mozilla/nsprpub/pr/include/md/_win95.h 20 Feb 2007 20:51:07 -0000 ++++ mozilla/nsprpub/pr/include/md/_win95.h 22 Feb 2007 02:14:52 -0000 @@ -61,6 +61,8 @@ /* newer ws2tcpip.h provides these */ #ifndef AI_CANONNAME @@ -21,7 +20,7 @@ retrieving revision 3.30 diff -u -r3.30 _winnt.h --- mozilla/nsprpub/pr/include/md/_winnt.h 20 Jun 2005 22:05:20 -0000 3.30 -+++ mozilla/nsprpub/pr/include/md/_winnt.h 20 Feb 2007 20:51:07 -0000 ++++ mozilla/nsprpub/pr/include/md/_winnt.h 22 Feb 2007 02:14:52 -0000 @@ -76,6 +76,8 @@ /* newer ws2tcpip.h provides these */ #ifndef AI_CANONNAME @@ -37,68 +36,39 @@ retrieving revision 3.47.2.1 diff -u -r3.47.2.1 prnetdb.c --- mozilla/nsprpub/pr/src/misc/prnetdb.c 14 Nov 2006 17:41:59 -0000 3.47.2.1 -+++ mozilla/nsprpub/pr/src/misc/prnetdb.c 20 Feb 2007 20:51:08 -0000 -@@ -39,6 +39,8 @@ ++++ mozilla/nsprpub/pr/src/misc/prnetdb.c 22 Feb 2007 02:14:52 -0000 +@@ -1772,99 +1772,6 @@ - #include + #endif /* !_PR_HAVE_INET_NTOP */ -+#define PR_AI_NUMERICHOST 0x4000 /* for internal use only */ -+ - /* - * On Unix, the error code for gethostbyname() and gethostbyaddr() - * is returned in the global variable h_errno, instead of the usual -@@ -1775,63 +1777,70 @@ - PR_IMPLEMENT(PRStatus) PR_StringToNetAddr(const char *string, PRNetAddr *addr) - { - PRStatus status = PR_SUCCESS; +-PR_IMPLEMENT(PRStatus) PR_StringToNetAddr(const char *string, PRNetAddr *addr) +-{ +- PRStatus status = PR_SUCCESS; - PRIntn rv; -+ PRAddrInfo *infop = NULL; -+ PRNetAddr laddr; - +- -#if defined(_PR_HAVE_INET_NTOP) - rv = inet_pton(AF_INET6, string, &addr->ipv6.ip); - if (1 == rv) -+ if (NULL == addr) - { +- { - addr->raw.family = PR_AF_INET6; -+ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); -+ return PR_FAILURE; - } +- } - else -+ infop = PR_GetAddrInfoByName(string, PR_AF_UNSPEC, -+ PR_AI_NUMERICHOST|PR_AI_ADDRCONFIG); -+ if (NULL == infop) -+ { -+ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); -+ return PR_FAILURE; -+ } -+ if (PR_EnumerateAddrInfo(NULL, infop, 0, &laddr) != NULL) - { +- { - PR_ASSERT(0 == rv); - /* clean up after the failed inet_pton() call */ - memset(&addr->ipv6.ip, 0, sizeof(addr->ipv6.ip)); - rv = inet_pton(AF_INET, string, &addr->inet.ip); - if (1 == rv) -+ /* pick up the first addr */ -+ if (PR_AF_INET6 == laddr.raw.family) -+ { -+ addr->ipv6.family = laddr.ipv6.family; -+ addr->ipv6.ip = laddr.ipv6.ip; -+ addr->ipv6.scope_id = laddr.ipv6.scope_id; -+ } -+ else if (PR_AF_INET == laddr.raw.family) - { +- { - addr->raw.family = AF_INET; -+ addr->inet.family = laddr.inet.family; -+ addr->inet.ip = laddr.inet.ip; - } - else - { +- } +- else +- { - PR_ASSERT(0 == rv); - PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); - status = PR_FAILURE; - } - } +- PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); +- status = PR_FAILURE; +- } +- } -#else /* _PR_HAVE_INET_NTOP */ - rv = StringToV6Addr(string, &addr->ipv6.ip); - if (1 == rv) { @@ -116,53 +86,58 @@ - addr->inet.ip = inet_addr(string); -#endif - if ((PRUint32) -1 == addr->inet.ip) -+ else - { +- { - /* - * The string argument is a malformed address string. - */ - PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); - status = PR_FAILURE; - } +- PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); +- status = PR_FAILURE; +- } -#endif /* _PR_HAVE_INET_NTOP */ - -+ PR_FreeAddrInfo(infop); - return status; - } - -+static int -+pr_GetNameInfo(const PRNetAddr *addr, size_t addrlen, -+ char *host, size_t hostlen, -+ char *serv, size_t servlen, PRIntn flags); -+ - PR_IMPLEMENT(PRStatus) PR_NetAddrToString( - const PRNetAddr *addr, char *string, PRUint32 size) - { -+#if defined(_PR_HAVE_GETADDRINFO) -+ PRIntn rv = 0; -+ size_t addrlen = 0; -+ -+ if (NULL == string || 0 == size) -+ goto failed; -+ addrlen = PR_NETADDR_SIZE(addr); -+ rv = pr_GetNameInfo(addr, addrlen, string, size, NULL, 0, NI_NUMERICHOST); -+ if (rv != 0) -+ goto failed; -+ return PR_SUCCESS; -+#else - if (PR_AF_INET6 == addr->raw.family) - { - #if defined(_PR_HAVE_INET_NTOP) -@@ -1858,7 +1867,7 @@ - } - - return PR_SUCCESS; +- return status; +-} - -+#endif - failed: - PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); - return PR_FAILURE; -@@ -1947,6 +1956,7 @@ +-PR_IMPLEMENT(PRStatus) PR_NetAddrToString( +- const PRNetAddr *addr, char *string, PRUint32 size) +-{ +- if (PR_AF_INET6 == addr->raw.family) +- { +-#if defined(_PR_HAVE_INET_NTOP) +- if (NULL == inet_ntop(AF_INET6, &addr->ipv6.ip, string, size)) +-#else +- if (NULL == V6AddrToString(&addr->ipv6.ip, string, size)) +-#endif +- { +- /* the size of the result buffer is inadequate */ +- PR_SetError(PR_BUFFER_OVERFLOW_ERROR, 0); +- return PR_FAILURE; +- } +- } +- else +- { +- if (size < 16) goto failed; +- if (AF_INET != addr->raw.family) goto failed; +- else +- { +- unsigned char *byte = (unsigned char*)&addr->inet.ip; +- PR_snprintf(string, size, "%u.%u.%u.%u", +- byte[0], byte[1], byte[2], byte[3]); +- } +- } +- +- return PR_SUCCESS; +- +-failed: +- PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); +- return PR_FAILURE; +- +-} /* PR_NetAddrToString */ +- + /* + * Convert an IPv4 addr to an (IPv4-mapped) IPv6 addr + */ +@@ -1947,12 +1854,13 @@ typedef struct addrinfo PRADDRINFO; #define GETADDRINFO getaddrinfo #define FREEADDRINFO freeaddrinfo @@ -170,7 +145,14 @@ #elif defined(_PR_INET6_PROBE) -@@ -1965,17 +1975,24 @@ + typedef struct addrinfo PRADDRINFO; + +-/* getaddrinfo/freeaddrinfo prototypes */ ++/* getaddrinfo/freeaddrinfo/getnameinfo prototypes */ + #if defined(WIN32) + #define FUNC_MODIFIER __stdcall + #else +@@ -1965,17 +1873,24 @@ PRADDRINFO **res); typedef int (FUNC_MODIFIER * FN_FREEADDRINFO) (PRADDRINFO *ai); @@ -195,33 +177,33 @@ #endif PRStatus -@@ -2003,6 +2020,12 @@ - PR_UnloadLibrary(lib); - continue; +@@ -2005,7 +1920,12 @@ } + _pr_freeaddrinfo = (FN_FREEADDRINFO) + PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL); +- PR_ASSERT(_pr_freeaddrinfo); + _pr_getnameinfo = (FN_GETNAMEINFO) + PR_FindFunctionSymbol(lib, GETNAMEINFO_SYMBOL); -+ if (!_pr_getnameinfo) { ++ if (!_pr_freeaddrinfo || !_pr_getnameinfo) { + PR_UnloadLibrary(lib); + continue; + } - _pr_freeaddrinfo = (FN_FREEADDRINFO) - PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL); - PR_ASSERT(_pr_freeaddrinfo); -@@ -2020,6 +2043,12 @@ - if (!_pr_getaddrinfo) { - return PR_FAILURE; + /* Keep the library loaded. */ + return PR_SUCCESS; + } +@@ -2022,8 +1942,10 @@ } -+ _pr_getnameinfo = (FN_GETNAMEINFO) -+ PR_FindFunctionSymbol(lib, GETNAMEINFO_SYMBOL); -+ if (!_pr_getnameinfo) { -+ PR_UnloadLibrary(lib); -+ return PR_FAILURE; -+ } _pr_freeaddrinfo = (FN_FREEADDRINFO) PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL); ++ _pr_getnameinfo = (FN_GETNAMEINFO) ++ PR_FindFunctionSymbol(lib, GETNAMEINFO_SYMBOL); PR_UnloadLibrary(lib); -@@ -2032,6 +2061,7 @@ +- if (!_pr_freeaddrinfo) { ++ if (!_pr_freeaddrinfo || !_pr_getnameinfo) { + return PR_FAILURE; + } + return PR_SUCCESS; +@@ -2032,6 +1954,7 @@ #define GETADDRINFO (*_pr_getaddrinfo) #define FREEADDRINFO (*_pr_freeaddrinfo) @@ -229,104 +211,204 @@ #endif /* _PR_INET6 */ -@@ -2048,6 +2078,46 @@ - PRBool has_cname; - } PRAddrInfoFB; - -+static PRBool -+pr_IsValidNumericHost(const char *string) +@@ -2201,3 +2124,200 @@ + return fb->has_cname ? fb->hostent.h_name : NULL; + #endif + } ++ ++#if defined(_PR_HAVE_GETADDRINFO) ++static PRStatus pr_StringToNetAddrGAI(const char *string, PRNetAddr *addr) ++{ ++ PRADDRINFO *res, hints; ++ int rv; /* 0 for success, or the error code EAI_xxx */ ++ PRNetAddr laddr; ++ PRStatus status = PR_SUCCESS; ++ ++ if (NULL == addr) ++ { ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ return PR_FAILURE; ++ } ++ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_flags = AI_NUMERICHOST; ++ hints.ai_family = AF_UNSPEC; ++ hints.ai_socktype = SOCK_STREAM; ++ ++ rv = GETADDRINFO(string, NULL, &hints, &res); ++ if (rv != 0) ++ { ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, rv); ++ return PR_FAILURE; ++ } ++ ++ /* pick up the first addr */ ++ memcpy(&laddr, res->ai_addr, res->ai_addrlen); ++ if (AF_INET6 == res->ai_addr->sa_family) ++ { ++ addr->ipv6.family = PR_AF_INET6; ++ addr->ipv6.ip = laddr.ipv6.ip; ++ addr->ipv6.scope_id = laddr.ipv6.scope_id; ++ } ++ else if (AF_INET == res->ai_addr->sa_family) ++ { ++ addr->inet.family = PR_AF_INET; ++ addr->inet.ip = laddr.inet.ip; ++ } ++ else ++ { ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ status = PR_FAILURE; ++ } ++ ++ FREEADDRINFO(res); ++ return status; ++} ++#endif /* _PR_HAVE_GETADDRINFO */ ++ ++#if !defined(_PR_HAVE_GETADDRINFO) || defined(_PR_INET6_PROBE) ++static PRStatus pr_StringToNetAddrFB(const char *string, PRNetAddr *addr) +{ -+ PRNetAddr addr; ++ PRStatus status = PR_SUCCESS; + PRIntn rv; ++ +#if defined(_PR_HAVE_INET_NTOP) -+ rv = inet_pton(AF_INET6, string, &addr.ipv6.ip); -+ if (0 < rv) { -+ return PR_TRUE; ++ rv = inet_pton(AF_INET6, string, &addr->ipv6.ip); ++ if (1 == rv) ++ { ++ addr->raw.family = PR_AF_INET6; + } -+ PR_ASSERT(0 == rv); -+ memset(&addr.ipv6.ip, 0, sizeof(addr.ipv6.ip)); -+ rv = inet_pton(AF_INET, string, &addr.inet.ip); -+ if (0 < rv) { -+ return PR_TRUE; ++ else ++ { ++ PR_ASSERT(0 == rv); ++ /* clean up after the failed inet_pton() call */ ++ memset(&addr->ipv6.ip, 0, sizeof(addr->ipv6.ip)); ++ rv = inet_pton(AF_INET, string, &addr->inet.ip); ++ if (1 == rv) ++ { ++ addr->raw.family = AF_INET; ++ } ++ else ++ { ++ PR_ASSERT(0 == rv); ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ status = PR_FAILURE; ++ } + } -+ return PR_FALSE; +#else /* _PR_HAVE_INET_NTOP */ -+ rv = StringToV6Addr(string, &addr.ipv6.ip); -+ if (0 < rv) { -+ return PR_TRUE; ++ rv = StringToV6Addr(string, &addr->ipv6.ip); ++ if (1 == rv) { ++ addr->raw.family = PR_AF_INET6; ++ return PR_SUCCESS; + } + PR_ASSERT(0 == rv); + /* clean up after the failed StringToV6Addr() call */ -+ memset(&addr.ipv6.ip, 0, sizeof(addr.ipv6.ip)); ++ memset(&addr->ipv6.ip, 0, sizeof(addr->ipv6.ip)); ++ ++ addr->inet.family = AF_INET; +#ifdef XP_OS2_VACPP -+ addr.inet.ip = inet_addr((char *)string); ++ addr->inet.ip = inet_addr((char *)string); +#else -+ addr.inet.ip = inet_addr(string); ++ addr->inet.ip = inet_addr(string); +#endif -+ if ((PRUint32) -1 == addr.inet.ip) { ++ if ((PRUint32) -1 == addr->inet.ip) ++ { + /* + * The string argument is a malformed address string. + */ -+ return PR_FALSE; ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ status = PR_FAILURE; + } -+ return PR_TRUE; ++#endif /* _PR_HAVE_INET_NTOP */ ++ ++ return status; ++} ++#endif /* !_PR_HAVE_GETADDRINFO || _PR_INET6_PROBE */ ++ ++PR_IMPLEMENT(PRStatus) PR_StringToNetAddr(const char *string, PRNetAddr *addr) ++{ ++ if (!_pr_initialized) _PR_ImplicitInitialization(); ++ ++#if !defined(_PR_HAVE_GETADDRINFO) ++ return pr_StringToNetAddrFB(string, addr); ++#else ++#if defined(_PR_INET6_PROBE) ++ if (!_pr_ipv6_is_present) ++ return pr_StringToNetAddrFB(string, addr); ++#endif ++ return pr_StringToNetAddrGAI(string, addr); +#endif +} + - static PRAddrInfo * - pr_GetAddrInfoByNameFB(const char *hostname, - PRUint16 af, -@@ -2055,6 +2125,13 @@ - { - PRStatus rv; - PRAddrInfoFB *ai; -+ -+ if (flags & PR_AI_NUMERICHOST) { -+ if (!pr_IsValidNumericHost(hostname)) { -+ PR_SetError(PR_BAD_ADDRESS_ERROR, 0); -+ return NULL; -+ } ++#if defined(_PR_HAVE_GETADDRINFO) ++static PRStatus pr_NetAddrToStringGNI( ++ const PRNetAddr *addr, char *string, PRUint32 size) ++{ ++ int addrlen; ++ int rv; /* 0 for success, or the error code EAI_xxx */ ++ ++ addrlen = PR_NETADDR_SIZE(addr); ++ rv = GETNAMEINFO((const struct sockaddr *)addr, addrlen, ++ string, size, NULL, 0, NI_NUMERICHOST); ++ if (rv != 0) ++ { ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, rv); ++ return PR_FAILURE; + } - /* fallback on PR_GetHostByName */ - ai = PR_NEW(PRAddrInfoFB); - if (!ai) { -@@ -2077,7 +2154,7 @@ - { - /* restrict input to supported values */ - if ((af != PR_AF_INET && af != PR_AF_UNSPEC) || -- (flags & ~ PR_AI_NOCANONNAME) != PR_AI_ADDRCONFIG) { -+ (flags & ~ (PR_AI_NOCANONNAME|PR_AI_NUMERICHOST)) != PR_AI_ADDRCONFIG) { - PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); - return NULL; - } -@@ -2104,6 +2181,7 @@ - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = (flags & PR_AI_NOCANONNAME) ? 0: AI_CANONNAME; -+ hints.ai_flags |= (flags & PR_AI_NUMERICHOST) ? AI_NUMERICHOST : 0; - hints.ai_family = (af == PR_AF_INET) ? AF_INET : AF_UNSPEC; - - /* -@@ -2139,6 +2217,22 @@ - #endif - } - -+/* -+ * A wrapper function for getnameinfo -+ * Caution: Not implemented for the system that does not have "getnameinfo" -+ */ -+static int -+pr_GetNameInfo(const PRNetAddr *addr, size_t addrlen, -+ char *host, size_t hostlen, -+ char *serv, size_t servlen, PRIntn flags) ++ return PR_SUCCESS; ++} ++#endif /* _PR_HAVE_GETADDRINFO */ ++ ++#if !defined(_PR_HAVE_GETADDRINFO) || defined(_PR_INET6_PROBE) ++static PRStatus pr_NetAddrToStringFB( ++ const PRNetAddr *addr, char *string, PRUint32 size) +{ -+#if defined(_PR_HAVE_GETADDRINFO) -+ return GETNAMEINFO((const struct sockaddr *)addr, addrlen, host, hostlen, serv, servlen, flags); ++ if (PR_AF_INET6 == addr->raw.family) ++ { ++#if defined(_PR_HAVE_INET_NTOP) ++ if (NULL == inet_ntop(AF_INET6, &addr->ipv6.ip, string, size)) +#else -+ return EAI_SYSTEM; /* not implemented */ ++ if (NULL == V6AddrToString(&addr->ipv6.ip, string, size)) +#endif -+} ++ { ++ /* the size of the result buffer is inadequate */ ++ PR_SetError(PR_BUFFER_OVERFLOW_ERROR, 0); ++ return PR_FAILURE; ++ } ++ } ++ else ++ { ++ if (size < 16) goto failed; ++ if (AF_INET != addr->raw.family) goto failed; ++ else ++ { ++ unsigned char *byte = (unsigned char*)&addr->inet.ip; ++ PR_snprintf(string, size, "%u.%u.%u.%u", ++ byte[0], byte[1], byte[2], byte[3]); ++ } ++ } + - PR_IMPLEMENT(void *) PR_EnumerateAddrInfo(void *iterPtr, - const PRAddrInfo *base, - PRUint16 port, ++ return PR_SUCCESS; ++ ++failed: ++ PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); ++ return PR_FAILURE; ++ ++} /* pr_NetAddrToStringFB */ ++#endif /* !_PR_HAVE_GETADDRINFO || _PR_INET6_PROBE */ ++ ++PR_IMPLEMENT(PRStatus) PR_NetAddrToString( ++ const PRNetAddr *addr, char *string, PRUint32 size) ++{ ++ if (!_pr_initialized) _PR_ImplicitInitialization(); ++ ++#if !defined(_PR_HAVE_GETADDRINFO) ++ return pr_NetAddrToStringFB(addr, string, size); ++#else ++#if defined(_PR_INET6_PROBE) ++ if (!_pr_ipv6_is_present) ++ return pr_NetAddrToStringFB(addr, string, size); ++#endif ++ return pr_NetAddrToStringGNI(addr, string, size); ++#endif ++} /* PR_NetAddrToString */ From fedora-cvs-commits at redhat.com Wed Mar 7 05:50:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 00:50:54 -0500 Subject: rpms/kernel/devel patch-2.6.21-rc2-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.580, 1.581 kernel-2.6.spec, 1.2967, 1.2968 linux-2.6-radeonfb-backlight-pci.patch, 1.1, 1.2 sources, 1.543, 1.544 upstream, 1.472, 1.473 linux-2.6-x86_64-include-fix.patch, 1.1, NONE patch-2.6.21-rc2-git4.bz2.sign, 1.1, NONE Message-ID: <200703070550.l275osV1002192@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30565 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-radeonfb-backlight-pci.patch sources upstream Added Files: patch-2.6.21-rc2-git5.bz2.sign Removed Files: linux-2.6-x86_64-include-fix.patch patch-2.6.21-rc2-git4.bz2.sign Log Message: rc2-git5 --- NEW FILE patch-2.6.21-rc2-git5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF7UDcyGugalF9Dw4RAuMZAJ9tKX1pnNowx+ItCvdVrjx8IUS9YQCcCaPM V8IzkKUHaP15cvXxzZFiqog= =6ev3 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.580 retrieving revision 1.581 diff -u -r1.580 -r1.581 --- .cvsignore 5 Mar 2007 19:34:10 -0000 1.580 +++ .cvsignore 7 Mar 2007 05:50:47 -0000 1.581 @@ -4,4 +4,4 @@ kernel-2.6.20 linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git4.bz2 +patch-2.6.21-rc2-git5.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2967 retrieving revision 1.2968 diff -u -r1.2967 -r1.2968 --- kernel-2.6.spec 6 Mar 2007 19:40:55 -0000 1.2967 +++ kernel-2.6.spec 7 Mar 2007 05:50:47 -0000 1.2968 @@ -295,7 +295,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.21-rc2.bz2 -Patch2: patch-2.6.21-rc2-git4.bz2 +Patch2: patch-2.6.21-rc2-git5.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -314,7 +314,6 @@ Patch201: linux-2.6-x86-vga-vidfail.patch 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_64-include-fix.patch # 300 - 399 ppc(64) Patch300: linux-2.6-g5-therm-shutdown.patch @@ -879,8 +878,6 @@ %patch202 -p1 # Suppress APIC errors on UP x86-64. %patch203 -p1 -# Fix up x86-64/x86 include file braindamage. -%patch204 -p1 # # PowerPC @@ -1055,7 +1052,7 @@ # Tickle the NMI whilst doing serial writes. #%patch1620 -p1 # Fix up radeon backlight. -%patch1630 -p1 +#%patch1630 -p1 # Allow to use 480600 baud on 16C950 UARTs %patch1650 -p1 # Fix XFS umount bug. @@ -2069,6 +2066,9 @@ # - tux. %changelog +* Wed Mar 07 2007 Dave Jones +- 2.6.21rc2-git5 + * Mon Mar 05 2007 Dave Jones - Generate modules.(scsi|libata|networking) linux-2.6-radeonfb-backlight-pci.patch: linux-2.6.20.i686/drivers/video/aty/radeon_backlight.c | 79 ++++++++++++++++- linux-2.6.20.i686/drivers/video/aty/radeon_pm.c | 10 +- linux-2.6.20.i686/drivers/video/aty/radeonfb.h | 2 linux-2.6.20.noarch/drivers/video/aty/radeon_base.c | 7 - 4 files changed, 86 insertions(+), 12 deletions(-) Index: linux-2.6-radeonfb-backlight-pci.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeonfb-backlight-pci.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-radeonfb-backlight-pci.patch 26 Feb 2007 22:33:25 -0000 1.1 +++ linux-2.6-radeonfb-backlight-pci.patch 7 Mar 2007 05:50:47 -0000 1.2 @@ -105,14 +105,16 @@ bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1; bd->props.brightness = bd->props.max_brightness; bd->props.power = FB_BLANK_UNBLANK; ---- linux-2.6.20.i686/drivers/video/aty/radeon_base.c.bl 2007-02-26 17:08:34.000000000 -0500 -+++ linux-2.6.20.i686/drivers/video/aty/radeon_base.c 2007-02-26 17:09:17.000000000 -0500 -@@ -2349,7 +2349,7 @@ +--- linux-2.6.20.noarch/drivers/video/aty/radeon_base.c~ 2007-03-07 00:46:26.000000000 -0500 ++++ linux-2.6.20.noarch/drivers/video/aty/radeon_base.c 2007-03-07 00:46:48.000000000 -0500 +@@ -2352,9 +2352,8 @@ static int __devinit radeonfb_pci_regist + rinfo->video_ram, MTRR_TYPE_WRCOMB, 1); #endif - -- radeonfb_bl_init(rinfo); -+ radeonfb_bl_init(rinfo, ignore_devlist); +- + if (backlight) +- radeonfb_bl_init(rinfo); ++ radeonfb_bl_init(rinfo, ignore_devlist); printk ("radeonfb (%s): %s\n", pci_name(rinfo->pdev), rinfo->name); Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.543 retrieving revision 1.544 diff -u -r1.543 -r1.544 --- sources 5 Mar 2007 19:34:10 -0000 1.543 +++ sources 7 Mar 2007 05:50:47 -0000 1.544 @@ -1,3 +1,3 @@ 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 e31c877d30a840c590c06e53779246f4 patch-2.6.21-rc2.bz2 -d6d255472d2fd1fbb45658c02d8802f3 patch-2.6.21-rc2-git4.bz2 +8baf8dd53a31392e4c1c0726dbe3f220 patch-2.6.21-rc2-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.472 retrieving revision 1.473 diff -u -r1.472 -r1.473 --- upstream 5 Mar 2007 19:34:10 -0000 1.472 +++ upstream 7 Mar 2007 05:50:47 -0000 1.473 @@ -1,3 +1,3 @@ linux-2.6.20.tar.bz2 patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git4.bz2 +patch-2.6.21-rc2-git5.bz2 --- linux-2.6-x86_64-include-fix.patch DELETED --- --- patch-2.6.21-rc2-git4.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 7 07:22:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 02:22:26 -0500 Subject: rpms/kernel/devel patch-2.6.21-rc3.bz2.sign, NONE, 1.1 .cvsignore, 1.581, 1.582 kernel-2.6.spec, 1.2968, 1.2969 linux-2.6-compile-fixes.patch, 1.147, 1.148 sources, 1.544, 1.545 upstream, 1.473, 1.474 linux-2.6-build-input-not-embedded.patch, 1.1, NONE linux-2.6-get-order-fix.patch, 1.1, NONE patch-2.6.21-rc2-git5.bz2.sign, 1.1, NONE patch-2.6.21-rc2.bz2.sign, 1.1, NONE Message-ID: <200703070722.l277MQjW012107@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12087 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch sources upstream Added Files: patch-2.6.21-rc3.bz2.sign Removed Files: linux-2.6-build-input-not-embedded.patch linux-2.6-get-order-fix.patch patch-2.6.21-rc2-git5.bz2.sign patch-2.6.21-rc2.bz2.sign Log Message: 2.6.21-rc3 --- NEW FILE patch-2.6.21-rc3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBF7lXoyGugalF9Dw4RAl46AJ9SLanwiJMkkOrLrMZnjVc+ihKCjACdFqCa cpV/iGG0l3iAF5QrnsdkwgM= =WX06 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.581 retrieving revision 1.582 diff -u -r1.581 -r1.582 --- .cvsignore 7 Mar 2007 05:50:47 -0000 1.581 +++ .cvsignore 7 Mar 2007 07:22:24 -0000 1.582 @@ -3,5 +3,4 @@ temp-* kernel-2.6.20 linux-2.6.20.tar.bz2 -patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git5.bz2 +patch-2.6.21-rc3.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2968 retrieving revision 1.2969 diff -u -r1.2968 -r1.2969 --- kernel-2.6.spec 7 Mar 2007 05:50:47 -0000 1.2968 +++ kernel-2.6.spec 7 Mar 2007 07:22:24 -0000 1.2969 @@ -294,8 +294,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.21-rc2.bz2 -Patch2: patch-2.6.21-rc2-git5.bz2 +Patch1: patch-2.6.21-rc3.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -340,8 +339,6 @@ # and patches related to how RPMs are build # Patch800: linux-2.6-build-nonintconfig.patch -Patch801: linux-2.6-build-input-not-embedded.patch -Patch802: linux-2.6-get-order-fix.patch # Exec-shield. Patch810: linux-2.6-execshield.patch @@ -847,7 +844,6 @@ # Update to latest upstream. %patch1 -p1 -%patch2 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -912,10 +908,6 @@ # also gives a list of missing options at the end. Useful for automated # builds (as used in the buildsystem). %patch800 -p1 -# Allow INPUT to be disabled without CONFIG_EMBEDDED -%patch801 -p1 -# Don't move free_initrd() call so late; it breaks things -%patch802 -p1 # Exec shield %patch810 -p1 @@ -1131,7 +1123,7 @@ # # misc small stuff to make things compile or otherwise improve performance # -%patch10000 -p1 +#%patch10000 -p1 # END OF PATCH APPLICATIONS @@ -2067,6 +2059,9 @@ %changelog * Wed Mar 07 2007 Dave Jones +- 2.6.21rc3 + +* Wed Mar 07 2007 Dave Jones - 2.6.21rc2-git5 * Mon Mar 05 2007 Dave Jones linux-2.6-compile-fixes.patch: 0 files changed Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- linux-2.6-compile-fixes.patch 5 Mar 2007 22:04:22 -0000 1.147 +++ linux-2.6-compile-fixes.patch 7 Mar 2007 07:22:24 -0000 1.148 @@ -5,20 +5,3 @@ # to do a compile to figure out what your diff is fixing. Thanks. # -drivers/video/nvidia/nv_backlight.c: In function 'nvidia_bl_init': -drivers/video/nvidia/nv_backlight.c:103: error: implicit declaration of function 'pmac_has_backlight_type' - -Signed-off-by: Dave Jones - ---- linux-2.6.20.noarch/drivers/video/nvidia/nv_backlight.c~ 2007-02-20 22:25:15.000000000 -0500 -+++ linux-2.6.20.noarch/drivers/video/nvidia/nv_backlight.c 2007-02-20 22:25:31.000000000 -0500 -@@ -12,6 +12,9 @@ - #include - #include - #include -+#ifdef CONFIG_PMAC_BACKLIGHT -+#include -+#endif - #include "nv_local.h" - #include "nv_type.h" - #include "nv_proto.h" Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.544 retrieving revision 1.545 diff -u -r1.544 -r1.545 --- sources 7 Mar 2007 05:50:47 -0000 1.544 +++ sources 7 Mar 2007 07:22:24 -0000 1.545 @@ -1,3 +1,2 @@ 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 -e31c877d30a840c590c06e53779246f4 patch-2.6.21-rc2.bz2 -8baf8dd53a31392e4c1c0726dbe3f220 patch-2.6.21-rc2-git5.bz2 +b5f274597e90fccc8325983267388557 patch-2.6.21-rc3.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.473 retrieving revision 1.474 diff -u -r1.473 -r1.474 --- upstream 7 Mar 2007 05:50:47 -0000 1.473 +++ upstream 7 Mar 2007 07:22:24 -0000 1.474 @@ -1,3 +1,2 @@ linux-2.6.20.tar.bz2 -patch-2.6.21-rc2.bz2 -patch-2.6.21-rc2-git5.bz2 +patch-2.6.21-rc3.bz2 --- linux-2.6-build-input-not-embedded.patch DELETED --- --- linux-2.6-get-order-fix.patch DELETED --- --- patch-2.6.21-rc2-git5.bz2.sign DELETED --- --- patch-2.6.21-rc2.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 7 07:25:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 02:25:48 -0500 Subject: rpms/kernel/devel Makefile.config, 1.52, 1.53 kernel-2.6.spec, 1.2969, 1.2970 Message-ID: <200703070725.l277Pmf7012189@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12161 Modified Files: Makefile.config kernel-2.6.spec Log Message: * Wed Mar 07 2007 Dave Jones - Remove last vestiges of the ppc64iseries specific kernel Index: Makefile.config =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- Makefile.config 3 Feb 2007 17:13:17 -0000 1.52 +++ Makefile.config 7 Mar 2007 07:25:46 -0000 1.53 @@ -10,7 +10,6 @@ $(CFG)-i686-debug.config $(CFG)-i686-PAE-debug.config \ $(CFG)-x86_64.config $(CFG)-x86_64-kdump.config \ $(CFG)-x86_64-debug.config \ - $(CFG)-ppc64iseries.config $(CFG)-ppc64iseries-kdump.config\ $(CFG)-s390.config $(CFG)-s390x.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \ @@ -125,15 +124,9 @@ kernel-$(VERSION)-ppc64.config: configs/config-powerpc64 temp-powerpc64-generic perl merge.pl $^ powerpc > $@ -kernel-$(VERSION)-ppc64iseries.config: configs/config-powerpc64-iseries temp-powerpc64-generic - perl merge.pl $^ powerpc > $@ - kernel-$(VERSION)-ppc64-kdump.config: configs/config-powerpc64-kdump kernel-$(VERSION)-ppc64.config perl merge.pl $^ powerpc > $@ -kernel-$(VERSION)-ppc64iseries-kdump.config: configs/config-powerpc64-iseries-kdump kernel-$(VERSION)-ppc64iseries.config - perl merge.pl $^ powerpc > $@ - kernel-$(VERSION)-s390.config: configs/config-s390 temp-s390-generic perl merge.pl $^ s390 > $@ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2969 retrieving revision 1.2970 diff -u -r1.2969 -r1.2970 --- kernel-2.6.spec 7 Mar 2007 07:22:24 -0000 1.2969 +++ kernel-2.6.spec 7 Mar 2007 07:25:46 -0000 1.2970 @@ -76,7 +76,7 @@ # Second, per-architecture exclusions (ifarch) -%ifarch ppc64iseries i686 i586 +%ifarch i686 i586 %define buildheaders 0 %endif @@ -101,7 +101,7 @@ %define signmodules 1 %endif -%ifarch ppc64 ppc64iseries +%ifarch ppc64 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config %define image_install_path boot %define signmodules 1 @@ -2059,6 +2059,9 @@ %changelog * Wed Mar 07 2007 Dave Jones +- Remove last vestiges of the ppc64iseries specific kernel + +* Wed Mar 07 2007 Dave Jones - 2.6.21rc3 * Wed Mar 07 2007 Dave Jones From fedora-cvs-commits at redhat.com Wed Mar 7 07:25:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 02:25:48 -0500 Subject: rpms/kernel/devel/configs config-powerpc64-iseries, 1.24, NONE config-powerpc64-iseries-kdump, 1.3, NONE Message-ID: <200703070725.l277PmBM012196@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv12161/configs Removed Files: config-powerpc64-iseries config-powerpc64-iseries-kdump Log Message: * Wed Mar 07 2007 Dave Jones - Remove last vestiges of the ppc64iseries specific kernel --- config-powerpc64-iseries DELETED --- --- config-powerpc64-iseries-kdump DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 7 08:27:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 03:27:37 -0500 Subject: rpms/htdig/devel htdig-3.2.0b6-segfault.patch, NONE, 1.1 htdig.spec, 1.35, 1.36 htdig-3.2.0b6-sigfault.patch, 1.2, NONE Message-ID: <200703070827.l278Rbwj018946@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/htdig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18611/htdig/devel Modified Files: htdig.spec Added Files: htdig-3.2.0b6-segfault.patch Removed Files: htdig-3.2.0b6-sigfault.patch Log Message: fixed htfuzzy segfaults with empty word database htdig-3.2.0b6-segfault.patch: Fuzzy.cc | 11 ++++++++--- Prefix.cc | 10 +++++----- Regexp.cc | 18 +++++++++--------- Substring.cc | 18 +++++++++--------- htfuzzy.cc | 12 ++++++++---- 5 files changed, 39 insertions(+), 30 deletions(-) --- NEW FILE htdig-3.2.0b6-segfault.patch --- --- htdig-3.2.0b6/htfuzzy/Regexp.cc.orig 2004-05-28 08:15:20.000000000 -0500 +++ htdig-3.2.0b6/htfuzzy/Regexp.cc 2007-03-06 15:48:03.000000000 -0600 @@ -73,16 +73,16 @@ int wordCount = 0; int maximumWords = config.Value("regex_max_words", 25); - wordList->Start_Get(); - while (wordCount < maximumWords && (key = (String *) wordList->Get_Next())) - { - if (regexMatch.match(*key, 0, 0) != 0) - { - words.Add(new String(*key)); - wordCount++; - } - } if (wordList) { + wordList->Start_Get(); + while (wordCount < maximumWords && (key = (String *) wordList->Get_Next())) + { + if (regexMatch.match(*key, 0, 0) != 0) + { + words.Add(new String(*key)); + wordCount++; + } + } wordList->Destroy(); delete wordList; } --- htdig-3.2.0b6/htfuzzy/Substring.cc.orig 2004-05-28 08:15:20.000000000 -0500 +++ htdig-3.2.0b6/htfuzzy/Substring.cc 2007-03-06 15:48:34.000000000 -0600 @@ -73,16 +73,16 @@ int wordCount = 0; int maximumWords = config.Value("substring_max_words", 25); - wordList->Start_Get(); - while (wordCount < maximumWords && (key = (String *) wordList->Get_Next())) - { - if (match.FindFirst((char*)*key) >= 0) - { - words.Add(new String(*key)); - wordCount++; - } - } if (wordList) { + wordList->Start_Get(); + while (wordCount < maximumWords && (key = (String *) wordList->Get_Next())) + { + if (match.FindFirst((char*)*key) >= 0) + { + words.Add(new String(*key)); + wordCount++; + } + } wordList->Destroy(); delete wordList; } --- htdig-3.2.0b6/htfuzzy/htfuzzy.cc.orig 2004-05-28 08:15:20.000000000 -0500 +++ htdig-3.2.0b6/htfuzzy/htfuzzy.cc 2007-03-06 15:53:04.000000000 -0600 @@ -153,8 +153,9 @@ String word, fuzzyKey; int count = 0; - words->Start_Get(); - while ((key = (String *) words->Get_Next())) + if (words) + words->Start_Get(); + while (words && (key = (String *) words->Get_Next())) { word = *key; wordAlgorithms.Start_Get(); @@ -185,8 +186,11 @@ fuzzy->writeDB(); } worddb.Close(); - words->Destroy(); - delete words; + if (words) + { + words->Destroy(); + delete words; + } if (fuzzy) delete fuzzy; } --- htdig-3.2.0b6/htfuzzy/Prefix.cc.orig 2004-05-28 08:15:20.000000000 -0500 +++ htdig-3.2.0b6/htfuzzy/Prefix.cc 2007-03-06 15:58:13.000000000 -0600 @@ -99,9 +99,10 @@ WordReference *word_ref; String last_word; - wordList->Start_Get(); - while (wordCount < maximumWords && (word_ref = (WordReference *) wordList->Get_Next() )) - { + if (wordList) { + wordList->Start_Get(); + while (wordCount < maximumWords && (word_ref = (WordReference *) wordList->Get_Next() )) + { s = word_ref->Key().GetWord(); // If we're somehow past the original word, we're done @@ -115,8 +116,7 @@ last_word = s; words.Add(new String(s)); wordCount++; - } - if (wordList) { + } wordList->Destroy(); delete wordList; } --- htdig-3.2.0b6/htfuzzy/Fuzzy.cc.orig 2004-05-28 08:15:20.000000000 -0500 +++ htdig-3.2.0b6/htfuzzy/Fuzzy.cc 2007-03-06 12:51:54.000000000 -0600 @@ -61,7 +61,11 @@ delete index; index = 0; } - delete dict; + if (dict) + { + delete dict; + dict = 0; + } } @@ -154,8 +158,9 @@ int count = 0; - dict->Start_Get(); - while ((fuzzyKey = dict->Get_Next())) + if (dict) + dict->Start_Get(); + while (dict && (fuzzyKey = dict->Get_Next())) { s = (String *) dict->Find(fuzzyKey); index->Put(fuzzyKey, *s); Index: htdig.spec =================================================================== RCS file: /cvs/dist/rpms/htdig/devel/htdig.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- htdig.spec 1 Feb 2007 15:45:26 -0000 1.35 +++ htdig.spec 7 Mar 2007 08:27:35 -0000 1.36 @@ -5,7 +5,7 @@ Summary: ht://Dig - Web search engine Name: htdig Version: 3.2.0b6 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 3 License: GPL Group: Applications/Internet @@ -23,7 +23,7 @@ Patch7: htdig-3.2.0b-versioncheck.patch Patch8: htdig-3.2.0b6-compile-fix.patch Patch9: htdig-3.2.0b6-opts.patch -#Patch10: htdig-3.2.0b6-sigfault.patch +Patch10: htdig-3.2.0b6-segfault.patch Patch11: htdig-3.2.0b6-incremental.patch BuildRequires: flex >= 2.5.4a-13 BuildRequires: zlib-devel httpd openssl-devel @@ -77,7 +77,7 @@ %patch7 -p1 -b .versioncheck %patch8 -p1 -b .compile-fix %patch9 -p1 -b .opts -#%patch10 -p1 -b .sigfault +%patch10 -p1 -b .segfault %patch11 -p1 -b .incremental %build @@ -96,7 +96,7 @@ --with-apache=/usr/sbin/httpd \ --with-zlib=/usr \ --with-ssl -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -149,6 +149,10 @@ %endif %changelog +* Wed Mar 07 2007 Adam Tkac 3:3.2.0b6-11.fc7 +- added upstream's segfault patch +- added ?_smp_mflags macro to make + * Thu Feb 01 2007 Adam Tkac 3:3.2.0b6-10.fc7 - removed sigfault patch because it isn't stable yet - changed common_dir in htdig.conf to /var/www/html/htdig (#220390) --- htdig-3.2.0b6-sigfault.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 7 09:05:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 04:05:25 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch, NONE, 1.1 openoffice.org.spec, 1.1091, 1.1092 Message-ID: <200703070905.l2795Pa6015454@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15439 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch Log Message: someone changed the location and format of the recently-used foo openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch: shell/source/unix/sysshell/makefile.mk | 6 shell/source/unix/sysshell/recently_used_file_handler.cxx | 500 -------------- source/unix/sysshell/makefile.mk | 0 source/unix/sysshell/recently_used_file_handler.cxx | 0 4 files changed, 12 insertions(+), 494 deletions(-) --- NEW FILE openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch --- Index: source/unix/sysshell/makefile.mk =================================================================== RCS file: /cvs/gsl/shell/source/unix/sysshell/makefile.mk,v retrieving revision 1.7.128.1 diff -u -r1.7.128.1 makefile.mk --- openoffice.org.orig/shell/source/unix/sysshell/makefile.mk 19 Jan 2007 13:08:02 -0000 1.7.128.1 +++ openoffice.org/shell/source/unix/sysshell/makefile.mk 7 Mar 2007 09:02:21 -0000 @@ -48,6 +48,11 @@ CFLAGS+=-DSYSTEM_EXPAT .ENDIF +.IF "$(ENABLE_GTK)" != "" +PKGCONFIG_MODULES=gtk+-2.0 +.INCLUDE: pkg_config.mk +.ENDIF + # --- Files -------------------------------------------------------- LIB1OBJFILES=$(SLO)$/systemshell.obj @@ -72,6 +77,7 @@ $(CPPULIB)\ $(CPPUHELPERLIB)\ $(COMPHELPERLIB) +SHL1STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//) .ENDIF # MACOSX SHL1LIBS=$(SLB)$/xmlparser.lib Index: source/unix/sysshell/recently_used_file_handler.cxx =================================================================== RCS file: /cvs/gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx,v retrieving revision 1.8 diff -u -r1.8 recently_used_file_handler.cxx --- openoffice.org.orig/shell/source/unix/sysshell/recently_used_file_handler.cxx 17 Sep 2006 01:42:41 -0000 1.8 +++ openoffice.org/shell/source/unix/sysshell/recently_used_file_handler.cxx 7 Mar 2007 09:02:21 -0000 @@ -95,477 +95,11 @@ #include #include #include +#include -using namespace ::com::sun::star; - -namespace /* private */ { - - const rtl::OUString ENVV_UPDATE_RECENTLY_USED = - rtl::OUString::createFromAscii("ENABLE_UPDATE_RECENTLY_USED"); - - //######################################## - inline rtl::OString get_file_extension(const rtl::OString& file_url) - { - sal_Int32 index = file_url.lastIndexOf('.'); - OSL_ENSURE((index != -1) && ((index + 1) < file_url.getLength()), "Invalid file url"); - return file_url.copy(index + 1); - } - - //######################################## - typedef std::vector string_container_t; - - #define TAG_RECENT_FILES "RecentFiles" - #define TAG_RECENT_ITEM "RecentItem" - #define TAG_URI "URI" - #define TAG_MIME_TYPE "Mime-Type" - #define TAG_TIMESTAMP "Timestamp" - #define TAG_PRIVATE "Private" - #define TAG_GROUPS "Groups" - #define TAG_GROUP "Group" - - //------------------------------------------------ - // compare two string_t's case insensitive, may also be done - // by specifying special traits for the string type but in this - // case it's easier to do it this way - struct str_icase_cmp : - public std::binary_function - { - bool operator() (const string_t& s1, const string_t& s2) const - { return (0 == strcasecmp(s1.c_str(), s2.c_str())); } - }; - - //------------------------------------------------ - struct recently_used_item - { - recently_used_item() : - is_private_(false) - {} - - recently_used_item( - const string_t& uri, - const string_t& mime_type, - const string_container_t& groups, - bool is_private = false) : - uri_(uri), - mime_type_(mime_type), - is_private_(is_private), - groups_(groups) - { - timestamp_ = time(NULL); - } - - void set_uri(const string_t& character) - { uri_ = character; } - - void set_mime_type(const string_t& character) - { mime_type_ = character; } - - void set_timestamp(const string_t& character) - { - time_t t; - if (sscanf(character.c_str(), "%ld", &t) != 1) - timestamp_ = -1; - else - timestamp_ = t; - } - - void set_is_private(const string_t& /*character*/) - { is_private_ = true; } - - void set_groups(const string_t& character) - { groups_.push_back(character); } - - void set_nothing(const string_t& /*character*/) - {} - - bool has_groups() const - { - return !groups_.empty(); - } - - bool has_group(const string_t& name) const - { - string_container_t::const_iterator iter_end = groups_.end(); - return (has_groups() && - iter_end != std::find_if( - groups_.begin(), iter_end, - std::bind2nd(str_icase_cmp(), name))); - } - - void write_xml(const recently_used_file& file) const - { - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); - - rtl::OString ts = rtl::OString::valueOf((sal_sSize)timestamp_); - write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); - - if (has_groups()) - { - write_xml_start_tag(TAG_GROUPS, file, true); - - string_container_t::const_iterator iter = groups_.begin(); - string_container_t::const_iterator iter_end = groups_.end(); - - for ( ; iter != iter_end; ++iter) - write_xml_tag(TAG_GROUP, (*iter), file); - - write_xml_end_tag(TAG_GROUPS, file); - } - write_xml_end_tag(TAG_RECENT_ITEM, file); - } - - static rtl::OString escape_content(const string_t &text) - { - rtl::OStringBuffer aBuf; - for (sal_uInt32 i = 0; i < text.length(); i++) - { -# define MAP(a,b) case a: aBuf.append(b); break - switch (text[i]) - { - MAP ('&', "&"); - MAP ('<', "<"); - MAP ('>', ">"); - MAP ('\'', "'"); - MAP ('"', """); - default: - aBuf.append(text[i]); - break; - } -# undef MAP - } - return aBuf.makeStringAndClear(); - } - - void write_xml_tag(const string_t& name, const string_t& value, const recently_used_file& file) const - { - write_xml_start_tag(name, file); - rtl::OString escaped = escape_content (value); - file.write(escaped.getStr(), escaped.getLength()); - write_xml_end_tag(name, file); - } - - void write_xml_tag(const string_t& name, const recently_used_file& file) const - { - file.write("<", 1); - file.write(name.c_str(), name.length()); - file.write("/>\n", 3); - } - - void write_xml_start_tag(const string_t& name, const recently_used_file& file, bool linefeed = false) const - { - file.write("<", 1); - file.write(name.c_str(), name.length()); - if (linefeed) - file.write(">\n", 2); - else - file.write(">", 1); - } - - void write_xml_end_tag(const string_t& name, const recently_used_file& file) const - { - file.write("\n", 2); - } - - string_t uri_; - string_t mime_type_; - time_t timestamp_; - bool is_private_; - string_container_t groups_; - }; - - typedef std::vector recently_used_item_list_t; - typedef void (recently_used_item::* SET_COMMAND)(const string_t&); - - //######################################## - // thrown if we encounter xml tags that we do not know - class unknown_xml_format_exception {}; - - //######################################## - class recently_used_file_filter : public i_xml_parser_event_handler - { - public: - recently_used_file_filter(recently_used_item_list_t& item_list) : - item_(NULL), - item_list_(item_list) - { - named_command_map_[TAG_RECENT_FILES] = &recently_used_item::set_nothing; - named_command_map_[TAG_RECENT_ITEM] = &recently_used_item::set_nothing; - named_command_map_[TAG_URI] = &recently_used_item::set_uri; - named_command_map_[TAG_MIME_TYPE] = &recently_used_item::set_mime_type; - named_command_map_[TAG_TIMESTAMP] = &recently_used_item::set_timestamp; - named_command_map_[TAG_PRIVATE] = &recently_used_item::set_is_private; - named_command_map_[TAG_GROUPS] = &recently_used_item::set_nothing; - named_command_map_[TAG_GROUP] = &recently_used_item::set_groups; - } - - virtual void start_element( - const string_t& /*raw_name*/, - const string_t& local_name, - const xml_tag_attribute_container_t& /*attributes*/) - { - if ((local_name == TAG_RECENT_ITEM) && (NULL == item_)) - item_ = new recently_used_item; - } - - virtual void end_element(const string_t& /*raw_name*/, const string_t& local_name) - { - if (named_command_map_.find(local_name) != named_command_map_.end()) - (item_->*named_command_map_[local_name])(current_element_); - else - { - delete item_; - throw unknown_xml_format_exception(); - } - - if (local_name == TAG_RECENT_ITEM) - { - item_list_.push_back(item_); - item_ = NULL; - } - current_element_.clear(); - } +#include - virtual void characters(const string_t& character) - { - if (character != "\n") - current_element_ += character; - } - - virtual void start_document() {} - virtual void end_document() {} - - virtual void ignore_whitespace(const string_t& /*whitespaces*/) - {} - - virtual void processing_instruction( - const string_t& /*target*/, const string_t& /*data*/) - {} - - virtual void comment(const string_t& /*comment*/) - {} - private: - recently_used_item* item_; - std::map named_command_map_; - string_t current_element_; - recently_used_item_list_t& item_list_; - private: - recently_used_file_filter(const recently_used_file_filter&); - recently_used_file_filter& operator=(const recently_used_file_filter&); - }; - - //------------------------------------------------ - void read_recently_used_items( - recently_used_file& file, - recently_used_item_list_t& item_list) - { - xml_parser xparser; - recently_used_file_filter ruff(item_list); - - xparser.set_document_handler(&ruff); - - char buff[16384]; - while (!file.eof()) - { - if (size_t length = file.read(buff, sizeof(buff))) - xparser.parse(buff, length, file.eof()); - } - } - - //------------------------------------------------ - // The file ~/.recently_used shall not contain more than 500 - // entries (see www.freedesktop.org) - const int MAX_RECENTLY_USED_ITEMS = 500; - - class recent_item_writer - { - public: - recent_item_writer( - recently_used_file& file, - int max_items_to_write = MAX_RECENTLY_USED_ITEMS) : - file_(file), - max_items_to_write_(max_items_to_write), - items_written_(0) - {} - - void operator() (const recently_used_item* item) - { - if (items_written_++ < max_items_to_write_) - item->write_xml(file_); - } - private: - recently_used_file& file_; - int max_items_to_write_; - int items_written_; - }; - - //------------------------------------------------ - const char* XML_HEADER = "\n\n"; - const char* XML_FOOTER = ""; - - //------------------------------------------------ - // assumes that the list is ordered decreasing - void write_recently_used_items( - recently_used_file& file, - recently_used_item_list_t& item_list) - { - if (!item_list.empty()) - { - file.truncate(); - file.reset(); - - file.write(XML_HEADER, strlen(XML_HEADER)); - - std::for_each( - item_list.begin(), - item_list.end(), - recent_item_writer(file)); - - file.write(XML_FOOTER, strlen(XML_FOOTER)); - } - } - - //------------------------------------------------ - struct delete_recently_used_item - { - void operator() (const recently_used_item* item) const - { delete item; } - }; - - //------------------------------------------------ - void recently_used_item_list_clear(recently_used_item_list_t& item_list) - { - std::for_each( - item_list.begin(), - item_list.end(), - delete_recently_used_item()); - item_list.clear(); - } - - //------------------------------------------------ - class find_item_predicate - { - public: - find_item_predicate(const string_t& uri) : - uri_(uri) - {} - - bool operator() (const recently_used_item* item) - { return (item->uri_ == uri_); } - private: - string_t uri_; - }; - - //------------------------------------------------ - struct greater_recently_used_item - { - bool operator ()(const recently_used_item* lhs, const recently_used_item* rhs) const - { return (lhs->timestamp_ > rhs->timestamp_); } - }; - - //------------------------------------------------ - const char* GROUP_OOO = "openoffice.org"; - const char* GROUP_STAR_OFFICE = "staroffice"; - const char* GROUP_STAR_SUITE = "starsuite"; - - //------------------------------------------------ - void recently_used_item_list_add( - recently_used_item_list_t& item_list, const rtl::OUString& file_url, const rtl::OUString& mime_type) - { - rtl::OString f = rtl::OUStringToOString(file_url, RTL_TEXTENCODING_UTF8); - - recently_used_item_list_t::iterator iter = - std::find_if( - item_list.begin(), - item_list.end(), - find_item_predicate(f.getStr())); - - if (iter != item_list.end()) - { - (*iter)->timestamp_ = time(NULL); - - if (!(*iter)->has_group(GROUP_OOO)) - (*iter)->groups_.push_back(GROUP_OOO); - if (!(*iter)->has_group(GROUP_STAR_OFFICE)) - (*iter)->groups_.push_back(GROUP_STAR_OFFICE); - if (!(*iter)->has_group(GROUP_STAR_SUITE)) - (*iter)->groups_.push_back(GROUP_STAR_SUITE); - } - else - { - string_container_t groups; - groups.push_back(GROUP_OOO); - groups.push_back(GROUP_STAR_OFFICE); - groups.push_back(GROUP_STAR_SUITE); - - string_t uri(f.getStr()); - string_t mimetype(rtl::OUStringToOString(mime_type, osl_getThreadTextEncoding()).getStr()); - - if (mimetype.length() == 0) - mimetype = "application/octet-stream"; - - item_list.push_back(new recently_used_item(uri, mimetype, groups)); - } - - // sort decreasing after the timestamp - // so that the newest items appear first - std::sort( - item_list.begin(), - item_list.end(), - greater_recently_used_item()); - } - - //############################## - bool update_recently_used_enabled() - { - rtl::OUString tmp; - osl_getEnvironment(ENVV_UPDATE_RECENTLY_USED.pData, &tmp.pData); - return (tmp.getLength() > 0); - } - - //------------------------------------------------ - struct cleanup_guard - { - cleanup_guard(recently_used_item_list_t& item_list) : - item_list_(item_list) - {} - ~cleanup_guard() - { recently_used_item_list_clear(item_list_); } - - recently_used_item_list_t& item_list_; - }; - -} // namespace private - -//########################################### -/* - example (see http::www.freedesktop.org): - - - - file:///home/federico/gedit.txt - text/plain - 1046485966 - - gedit - - - - file:///home/federico/gedit-2.2.0.tar.bz2 - application/x-bzip - 1046209851 - - - - - -*/ +using namespace ::com::sun::star; const rtl::OUString DEFAULT_CONTEXT = rtl::OUString::createFromAscii("DefaultContext"); @@ -591,31 +125,9 @@ return extUrl; } -extern "C" void add_to_recently_used_file_list(const rtl::OUString& file_url, const rtl::OUString& mime_type) +extern "C" void add_to_recently_used_file_list(const rtl::OUString& file_url, const rtl::OUString& ) { - try - { - recently_used_file ruf; - recently_used_item_list_t item_list; - cleanup_guard guard(item_list); - rtl::OUString externalUrl = translateToExternalUrl(file_url); - - read_recently_used_items(ruf, item_list); - recently_used_item_list_add(item_list, externalUrl.getLength() ? externalUrl : file_url, mime_type); - write_recently_used_items(ruf, item_list); - } - catch(const char* ex) - { - OSL_ENSURE(false, ex); - } - catch(const xml_parser_exception&) - { - OSL_ENSURE(false, "XML parser error"); - } - catch(const unknown_xml_format_exception&) - { - OSL_ENSURE(false, "XML format unknown"); - } + GtkRecentManager* recentmanager = gtk_recent_manager_get_default(); + gtk_recent_manager_add_item(recentmanager, rtl::OUStringToOString(file_url, RTL_TEXTENCODING_UTF8).getStr()); } - Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1091 retrieving revision 1.1092 diff -u -r1.1091 -r1.1092 --- openoffice.org.spec 6 Mar 2007 15:42:19 -0000 1.1091 +++ openoffice.org.spec 7 Mar 2007 09:05:22 -0000 1.1092 @@ -125,6 +125,7 @@ Patch68: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch Patch69: openoffice.org-2.2.0.ooo63159.sal.dtype.patch Patch70: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch +Patch71: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch %define instdir %{_libdir}/openoffice.org @@ -1042,6 +1043,7 @@ %patch68 -p1 -b .ooo68717.gstreamer.video.patch %patch69 -p1 -b .ooo63159.sal.dtype.patch %patch70 -p1 -b .ooo75167.framework.workspacerestore.patch +%patch71 -p1 -b .ooo75190.shell.newrecentlyused.patch cp %{SOURCE1} extras/source/database/evolocal.odb @@ -2587,11 +2589,13 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Tue Mar 06 2007 Caolan McNamara - 1:2.2.0-10.2 +* Wed Mar 07 2007 Caolan McNamara - 1:2.2.0-10.2 - rhbz#206268/ooo#75167 session restore back to the right workspace - -fno-threadsafe-statics seeing as we're already double locked http://people.redhat.com/caolanm/speed/threadsafe-statics.ods - drop openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch, atk fixed +- add openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch, the + ~/.recently-used location and format changed * Sun Mar 04 2007 Caolan McNamara - 1:2.2.0-10.1 - next release candidate From fedora-cvs-commits at redhat.com Wed Mar 7 09:25:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 04:25:54 -0500 Subject: rpms/man-pages-de/devel .cvsignore, 1.4, 1.5 man-pages-de.spec, 1.14, 1.15 sources, 1.4, 1.5 man-pages-de-0.2-rofffixes.patch, 1.1, NONE man-pages-de-0.4-nfs_typo.patch, 1.1, NONE Message-ID: <200703070925.l279PsWg008778@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/man-pages-de/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8762 Modified Files: .cvsignore man-pages-de.spec sources Removed Files: man-pages-de-0.2-rofffixes.patch man-pages-de-0.4-nfs_typo.patch Log Message: Update version, merge review. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/man-pages-de/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 08:16:47 -0000 1.4 +++ .cvsignore 7 Mar 2007 09:25:52 -0000 1.5 @@ -1 +1,2 @@ manpages-de-0.4.tar.gz +manpages-de-0.5.tar.gz Index: man-pages-de.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-de/devel/man-pages-de.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- man-pages-de.spec 26 Jun 2006 07:37:17 -0000 1.14 +++ man-pages-de.spec 7 Mar 2007 09:25:52 -0000 1.15 @@ -1,18 +1,15 @@ -Summary: German man pages from the Linux Documentation Project. +Summary: German man pages from the Linux Documentation Project Name: man-pages-de -Version: 0.4 -Release: 11 +Version: 0.5 +Release: 1%{?dist} License: Distributable Group: Documentation URL: http://www.infodrom.org/projects/manpages-de/ Source: http://www.infodrom.org/projects/manpages-de/download/manpages-de-%{version}.tar.gz -Patch0: man-pages-de-0.2-rofffixes.patch -Patch1: man-pages-de-0.3-nolocalfile.patch -Patch2: man-pages-de-0.4-ps_space.patch -Patch3: man-pages-de-0.4-nfs_typo.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildArchitectures: noarch - +Patch0: man-pages-de-0.3-nolocalfile.patch +Patch1: man-pages-de-0.4-ps_space.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch %description Manual pages from the Linux Documentation Project, translated into @@ -21,10 +18,8 @@ %prep %setup -q -n manpages-de-%{version} -#patch0 -p1 +%patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build rm -f man1/hostname.* @@ -43,7 +38,7 @@ mv -f $i.new $i done LC_ALL=de_DE make prefix=$RPM_BUILD_ROOT/usr \ - MANDIR=$RPM_BUILD_ROOT/%{_mandir}/de install + MANDIR=$RPM_BUILD_ROOT/%{_mandir}/de install rm -f $RPM_BUILD_ROOT%{_mandir}/de/man1/{apropos.1,man.1,whatis.1}* rm -f $RPM_BUILD_ROOT%{_mandir}/de/man5/man.config.5* @@ -52,13 +47,17 @@ rm -fr $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc CHANGES COPYRIGHT README %dir %{_mandir}/de %{_mandir}/de/* %changelog +* Wed Mar 07 2007 Marcela Maslanova 0.5-1 +- merge review, update on new version +- rhbz#226123 + * Mon Jul 26 2006 Ivana Varekova 0.4-11 - fix bug 196453 - remove newgrp.1 man page @@ -93,27 +92,27 @@ * Thu May 23 2002 Tim Powers - automated rebuild -* Wed Mar 13 2002 Trond Eivind Glomsr?d 0.4-1 +* Wed Mar 13 2002 Trond Eivind Glomsr??d 0.4-1 - 0.4 * Tue Aug 14 2001 Tim Powers - rebuilt to hopefully fix rpm verify problem -* Mon Aug 13 2001 Trond Eivind Glomsr?d +* Mon Aug 13 2001 Trond Eivind Glomsr??d - Rebuild (should fix #51677) -* Thu Aug 2 2001 Trond Eivind Glomsr?d +* Thu Aug 2 2001 Trond Eivind Glomsr??d - Own /usr/share/man/de -* Thu May 31 2001 Trond Eivind Glomsr?d +* Thu May 31 2001 Trond Eivind Glomsr??d - 0.3 - Added URL, changed location - Remove --local-file option from the German man(1) (#39211) -* Sun Apr 8 2001 Trond Eivind Glomsr?d +* Sun Apr 8 2001 Trond Eivind Glomsr??d - Remove hostname.1, it's now part of net-tools -* Tue Apr 3 2001 Trond Eivind Glomsr?d +* Tue Apr 3 2001 Trond Eivind Glomsr??d - Some fixes to the roff sources (#34183) * Wed Jul 12 2000 Prospector @@ -125,8 +124,8 @@ * Mon Jun 19 2000 Matt Wilson - defattr root -* Sun Jun 11 2000 Trond Eivind Glomsr?d +* Sun Jun 11 2000 Trond Eivind Glomsr??d - use %%{_mandir} and %%{_tmppath} -* Mon May 15 2000 Trond Eivind Glomsr?d +* Mon May 15 2000 Trond Eivind Glomsr??d - first build Index: sources =================================================================== RCS file: /cvs/dist/rpms/man-pages-de/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 08:16:47 -0000 1.4 +++ sources 7 Mar 2007 09:25:52 -0000 1.5 @@ -1 +1,2 @@ 6a2a1cd24b0bd61c4ab384324e707a95 manpages-de-0.4.tar.gz +6686b1be6da01cdbb5ea7511ddcf61a0 manpages-de-0.5.tar.gz --- man-pages-de-0.2-rofffixes.patch DELETED --- --- man-pages-de-0.4-nfs_typo.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 7 09:35:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 04:35:19 -0500 Subject: rpms/firefox/FC-6 firefox-1.5-ppc64.patch, 1.1, 1.2 firefox.sh.in, 1.15, 1.16 firefox.spec, 1.166, 1.167 Message-ID: <200703070935.l279ZJwe024679@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/firefox/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv24529 Modified Files: firefox.sh.in firefox.spec Added Files: firefox-1.5-ppc64.patch Log Message: ppc64 fixes firefox-1.5-ppc64.patch: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s | 154 ++++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s | 102 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in | 5 xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp | 127 +++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp | 247 ++++++++++ 5 files changed, 635 insertions(+) Index: firefox-1.5-ppc64.patch =================================================================== RCS file: firefox-1.5-ppc64.patch diff -N firefox-1.5-ppc64.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ firefox-1.5-ppc64.patch 7 Mar 2007 09:35:16 -0000 1.2 @@ -0,0 +1,663 @@ +Updated version of patch, fixes 16-byte stack alignment after +XPTC_InvokeByIndex(). + +unchanged: +--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-21 17:09:28.000000000 +0000 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 10:13:38.000000000 +0000 +@@ -267,6 +267,11 @@ + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp + endif ++ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64) ++CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp ++ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s ++AS := $(CC) -c -x assembler-with-cpp ++endif + + # + # NetBSD/PPC +diff -u mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s 2006-11-21 14:01:45.000000000 +0000 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s 2006-11-22 10:43:26.000000000 +0000 +@@ -0,0 +1,154 @@ ++// -*- Mode: Asm -*- ++// ++// The contents of this file are subject to the Netscape Public ++// License Version 1.1 (the "License"); you may not use this file ++// except in compliance with the License. You may obtain a copy of ++// the License at http://www.mozilla.org/NPL/ ++// ++// Software distributed under the License is distributed on an "AS ++// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++// implied. See the License for the specific language governing ++// rights and limitations under the License. ++// ++// The Original Code is mozilla.org code. ++// ++// The Initial Developer of the Original Code is Netscape ++// Communications Corporation. Portions created by Netscape are ++// Copyright (C) 1999 Netscape Communications Corporation. All ++// Rights Reserved. ++// ++// Contributor(s): ++// dwmw2 at infradead.org (David Woodhouse) ++// Franz.Sirl-kernel at lauterbach.com (Franz Sirl) ++// beard at netscape.com (Patrick Beard) ++// waterson at netscape.com (Chris Waterson) ++// ++ ++.set r0,0; .set r1,1; .set r2,2; .set r3,3; .set r4,4 ++.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 ++.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14 ++.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19 ++.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24 ++.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29 ++.set r30,30; .set r31,31 ++.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4 ++.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9 ++.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14 ++.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19 ++.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24 ++.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 ++.set f30,30; .set f31,31 ++ ++ ++// ++// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, ++// PRUint32 paramCount, nsXPTCVariant* params) ++// ++ ++ .section ".toc","aw" ++ .section ".text" ++ .align 2 ++ .globl XPTC_InvokeByIndex ++ .section ".opd","aw" ++ .align 3 ++XPTC_InvokeByIndex: ++ .quad .XPTC_InvokeByIndex,.TOC. at tocbase ++ .previous ++ .type XPTC_InvokeByIndex, at function ++.XPTC_InvokeByIndex: ++ mflr 0 ++ std 0,16(r1) ++ ++ std r29,-24(r1) ++ std r30,-16(r1) ++ std r31,-8(r1) ++ ++ mr r29,r3 // Save 'that' in r29 ++ mr r30,r4 // Save 'methodIndex' in r30 ++ mr r31,r1 // Save old frame ++ ++ // Allocate stack frame with space for params. Since at least the ++ // first 7 parameters (not including 'that') will be in registers, ++ // we don't actually need stack space for those. We must ensure ++ // that the stack remains 16-byte aligned. ++ // ++ // | ..128-byte stack frame.. | | 7 GP | 13 FP | 3 NV | ++ // | |(params)........| regs | regs | regs | ++ // (r1)...........(+112)....(+128) ++ // (-23*8).(-16*8).(-3*8)..(r31) ++ ++ // +stack frame, -unused stack params, +regs storage, +1 for alignment ++ addi r7,r5,((112/8)-7+7+13+3+1) ++ rldicr r7,r7,3,59 // multiply by 8 and mask with ~15 ++ neg r7,r7 ++ stdux r1,r1,r7 ++ ++ ++ // Call invoke_copy_to_stack(PRUint64* gpregs, double* fpregs, ++ // PRUint32 paramCount, nsXPTCVariant* s, ++ // PRUint64* d)) ++ ++ // r5, r6 are passed through intact (paramCount, params) ++ // r7 (d) has to be r1+112 -- where parameters are passed on the stack. ++ // r3, r4 are above that, easier to address from r31 than from r1 ++ ++ subi r3,r31,(23*8) // r3 --> GPRS ++ subi r4,r31,(16*8) // r4 --> FPRS ++ addi r7,r1,112 // r7 --> params ++ bl invoke_copy_to_stack ++ nop ++ ++ // Set up to invoke function ++ ++ ld r9,0(r29) // vtable (r29 is 'that') ++ mr r3,r29 // self is first arg, obviously ++ ++ sldi r30,r30,3 // Find function descriptor ++ add r9,r9,r30 ++ ld r9,0(r9) ++ ++ ld r0,0(r9) // Actual address from fd. ++ std r2,40(r1) // Save r2 (TOC pointer) ++ ++ mtctr 0 ++ ld r11,16(r9) // Environment pointer from fd. ++ ld r2,8(r9) // TOC pointer from fd. ++ ++ // Load FP and GP registers as required ++ ld r4, -(23*8)(r31) ++ ld r5, -(22*8)(r31) ++ ld r6, -(21*8)(r31) ++ ld r7, -(20*8)(r31) ++ ld r8, -(19*8)(r31) ++ ld r9, -(18*8)(r31) ++ ld r10, -(17*8)(r31) ++ ++ lfd f1, -(16*8)(r31) ++ lfd f2, -(15*8)(r31) ++ lfd f3, -(14*8)(r31) ++ lfd f4, -(13*8)(r31) ++ lfd f5, -(12*8)(r31) ++ lfd f6, -(11*8)(r31) ++ lfd f7, -(10*8)(r31) ++ lfd f8, -(9*8)(r31) ++ lfd f9, -(8*8)(r31) ++ lfd f10, -(7*8)(r31) ++ lfd f11, -(6*8)(r31) ++ lfd f12, -(5*8)(r31) ++ lfd f13, -(4*8)(r31) ++ ++ bctrl // Do it ++ ++ ld r2,40(r1) // Load our own TOC pointer ++ ld r1,0(r1) // Revert stack frame ++ ld 0,16(r1) // Reload lr ++ ld 29,-24(r1) // Restore NVGPRS ++ ld 30,-16(r1) ++ ld 31,-8(r1) ++ mtlr 0 ++ blr ++ ++ .size XPTC_InvokeByIndex,.-.XPTC_InvokeByIndex ++ ++ /* Magic indicating no need for an executable stack */ ++ .section .note.GNU-stack, "", @progbits ; .previous +--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp 2006-11-21 17:00:06.000000000 +0000 +@@ -0,0 +1,127 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1998 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * dwmw2 at infradead.org (David Woodhouse) ++ * Franz.Sirl-kernel at lauterbach.com (Franz Sirl) ++ * beard at netscape.com (Patrick Beard) ++ * waterson at netscape.com (Chris Waterson) ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either of the GNU General Public License Version 2 or later (the "GPL"), ++ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++// Platform specific code to invoke XPCOM methods on native objects ++ ++// The purpose of XPTC_InvokeByIndex() is to map a platform ++// independent call to the platform ABI. To do that, ++// XPTC_InvokeByIndex() has to determine the method to call via vtable ++// access. The parameters for the method are read from the ++// nsXPTCVariant* and prepared for the native ABI. ++ ++#include ++#include "xptcprivate.h" ++ ++// 8 integral parameters are passed in registers, not including 'that' ++#define GPR_COUNT 7 ++ ++// 8 floating point parameters are passed in registers, floats are ++// promoted to doubles when passed in registers ++#define FPR_COUNT 13 ++ ++extern "C" PRUint32 ++invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s) ++{ ++ return PRUint32(((paramCount * 2) + 3) & ~3); ++} ++ ++extern "C" void ++invoke_copy_to_stack(PRUint64* gpregs, ++ double* fpregs, ++ PRUint32 paramCount, ++ nsXPTCVariant* s, ++ PRUint64* d) ++{ ++ PRUint64 tempu64; ++ ++ for(uint32 i = 0; i < paramCount; i++, s++) { ++ if(s->IsPtrData()) ++ tempu64 = (PRUint64) s->ptr; ++ else { ++ switch(s->type) { ++ case nsXPTType::T_FLOAT: break; ++ case nsXPTType::T_DOUBLE: break; ++ case nsXPTType::T_I8: tempu64 = s->val.i8; break; ++ case nsXPTType::T_I16: tempu64 = s->val.i16; break; ++ case nsXPTType::T_I32: tempu64 = s->val.i32; break; ++ case nsXPTType::T_I64: tempu64 = s->val.i64; break; ++ case nsXPTType::T_U8: tempu64 = s->val.u8; break; ++ case nsXPTType::T_U16: tempu64 = s->val.u16; break; ++ case nsXPTType::T_U32: tempu64 = s->val.u32; break; ++ case nsXPTType::T_U64: tempu64 = s->val.u64; break; ++ case nsXPTType::T_BOOL: tempu64 = s->val.b; break; ++ case nsXPTType::T_CHAR: tempu64 = s->val.c; break; ++ case nsXPTType::T_WCHAR: tempu64 = s->val.wc; break; ++ default: tempu64 = (PRUint64) s->val.p; break; ++ } ++ } ++ ++ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { ++ if (i < FPR_COUNT) ++ fpregs[i] = s->val.d; ++ else ++ *(double *)d = s->val.d; ++ } ++ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { ++ if (i < FPR_COUNT) { ++ fpregs[i] = s->val.f; // if passed in registers, floats are promoted to doubles ++ } else { ++ float *p = (float *)d; ++ p++; ++ *p = s->val.f; ++ } ++ } ++ else { ++ if (i < GPR_COUNT) ++ gpregs[i] = tempu64; ++ else ++ *d = tempu64; ++ } ++ if (i >= 7) ++ d++; ++ } ++} ++ ++extern "C" ++XPTC_PUBLIC_API(nsresult) ++XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, ++ PRUint32 paramCount, nsXPTCVariant* params); ++ +diff -u mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s 2006-11-21 16:38:52.000000000 +0000 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s 2006-11-22 10:51:14.000000000 +0000 +@@ -0,0 +1,102 @@ ++// -*- Mode: Asm -*- ++// ++// The contents of this file are subject to the Netscape Public ++// License Version 1.1 (the "License"); you may not use this file ++// except in compliance with the License. You may obtain a copy of ++// the License at http://www.mozilla.org/NPL/ ++// ++// Software distributed under the License is distributed on an "AS ++// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++// implied. See the License for the specific language governing ++// rights and limitations under the License. ++// ++// The Original Code is mozilla.org code. ++// ++// The Initial Developer of the Original Code is Netscape ++// Communications Corporation. Portions created by Netscape are ++// Copyright (C) 1999 Netscape Communications Corporation. All ++// Rights Reserved. ++// ++// Contributor(s): ++// dwmw2 at infradead.org (David Woodhouse) ++// Franz.Sirl-kernel at lauterbach.com (Franz Sirl) ++// beard at netscape.com (Patrick Beard) ++// waterson at netscape.com (Chris Waterson) ++// ++ ++.set r0,0; .set r1,1; .set RTOC,2; .set r3,3; .set r4,4 ++.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 ++.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14 ++.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19 ++.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24 ++.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29 ++.set r30,30; .set r31,31 ++.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4 ++.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9 ++.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14 ++.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19 ++.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24 ++.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 ++.set f30,30; .set f31,31 ++ ++ .section ".text" ++ .align 2 ++ .globl SharedStub ++ .section ".opd","aw" ++ .align 3 ++ ++SharedStub: ++ .quad .SharedStub,.TOC. at tocbase ++ .previous ++ .type SharedStub, at function ++ ++.SharedStub: ++ mflr r0 ++ ++ std r4, -56(r1) // Save all GPRS ++ std r5, -48(r1) ++ std r6, -40(r1) ++ std r7, -32(r1) ++ std r8, -24(r1) ++ std r9, -16(r1) ++ std r10, -8(r1) ++ ++ stfd f13, -64(r1) // ... and FPRS ++ stfd f12, -72(r1) ++ stfd f11, -80(r1) ++ stfd f10, -88(r1) ++ stfd f9, -96(r1) ++ stfd f8, -104(r1) ++ stfd f7, -112(r1) ++ stfd f6, -120(r1) ++ stfd f5, -128(r1) ++ stfd f4, -136(r1) ++ stfd f3, -144(r1) ++ stfd f2, -152(r1) ++ stfd f1, -160(r1) ++ ++ subi r6,r1,56 // r6 --> gprData ++ subi r7,r1,160 // r7 --> fprData ++ addi r5,r1,112 // r5 --> extra stack args ++ ++ std r0, 16(r1) ++ ++ stdu r1,-288(r1) ++ // r3 has the 'self' pointer already ++ ++ mr r4,r11 // r4 is methodIndex selector, passed ++ // via r11 in the nsXPTCStubBase::StubXX() call ++ ++ bl PrepareAndDispatch ++ nop ++ ++ ld 1,0(r1) // restore stack ++ ld r0,16(r1) // restore LR ++ mtlr r0 ++ blr ++ ++ .size SharedStub,.-.SharedStub ++ ++ ++/* Magic indicating no need for an executable stack */ ++.section .note.GNU-stack, "", @progbits ; .previous +unchanged: +--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp 2006-11-21 16:59:46.000000000 +0000 +@@ -0,0 +1,247 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1999 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * dwmw2 at infradead.org (David Woodhouse) ++ * Franz.Sirl-kernel at lauterbach.com (Franz Sirl) ++ * beard at netscape.com (Patrick Beard) ++ * waterson at netscape.com (Chris Waterson) ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either of the GNU General Public License Version 2 or later (the "GPL"), ++ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++// Implement shared vtbl methods. ++ ++#include "xptcprivate.h" ++ ++// The Linux/PPC ABI (aka PPC/SYSV ABI) passes the first 8 integral ++// parameters and the first 13 floating point parameters in registers ++// (r3-r10 and f1-f13), no stack space is allocated for these by the ++// caller. The rest of the parameters are passed in the callers stack ++// area. The stack pointer has to retain 16-byte alignment, longlongs ++// and doubles are aligned on 8-byte boundaries. ++ ++#define PARAM_BUFFER_COUNT 16 ++#define GPR_COUNT 7 ++#define FPR_COUNT 13 ++ ++// PrepareAndDispatch() is called by SharedStub() and calls the actual method. ++// ++// - 'args[]' contains the arguments passed on stack ++// - 'gprData[]' contains the arguments passed in integer registers ++// - 'fprData[]' contains the arguments passed in floating point registers ++// ++// The parameters are mapped into an array of type 'nsXPTCMiniVariant' ++// and then the method gets called. ++#include ++extern "C" nsresult ++PrepareAndDispatch(nsXPTCStubBase* self, ++ PRUint64 methodIndex, ++ PRUint64* args, ++ PRUint64 *gprData, ++ double *fprData) ++{ ++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; ++ nsXPTCMiniVariant* dispatchParams = NULL; ++ nsIInterfaceInfo* iface_info = NULL; ++ const nsXPTMethodInfo* info; ++ PRUint32 paramCount; ++ PRUint32 i; ++ nsresult result = NS_ERROR_FAILURE; ++ ++ NS_ASSERTION(self,"no self"); ++ ++ self->GetInterfaceInfo(&iface_info); ++ NS_ASSERTION(iface_info,"no interface info"); ++ if (! iface_info) ++ return NS_ERROR_UNEXPECTED; ++ ++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); ++ NS_ASSERTION(info,"no method info"); ++ if (! info) ++ return NS_ERROR_UNEXPECTED; ++ ++ paramCount = info->GetParamCount(); ++ ++ // setup variant array pointer ++ if(paramCount > PARAM_BUFFER_COUNT) ++ dispatchParams = new nsXPTCMiniVariant[paramCount]; ++ else ++ dispatchParams = paramBuffer; ++ ++ NS_ASSERTION(dispatchParams,"no place for params"); ++ if (! dispatchParams) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ PRUint64* ap = args; ++ PRUint64 tempu64; ++ ++ for(i = 0; i < paramCount; i++) { ++ const nsXPTParamInfo& param = info->GetParam(i); ++ const nsXPTType& type = param.GetType(); ++ nsXPTCMiniVariant* dp = &dispatchParams[i]; ++ ++ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { ++ if (i < FPR_COUNT) ++ dp->val.d = fprData[i]; ++ else ++ dp->val.d = *(double*) ap; ++ } else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { ++ if (i < FPR_COUNT) ++ dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles ++ else { ++ float *p = (float *)ap; ++ p++; ++ dp->val.f = *p; ++ } ++ } else { /* integer type or pointer */ ++ if (i < GPR_COUNT) ++ tempu64 = gprData[i]; ++ else ++ tempu64 = *ap; ++ ++ if (param.IsOut() || !type.IsArithmetic()) ++ dp->val.p = (void*) tempu64; ++ else if (type ==nsXPTType::T_I8) ++ dp->val.i8 = (PRInt8) tempu64; ++ else if (type ==nsXPTType::T_I16) ++ dp->val.i16 = (PRInt16) tempu64; ++ else if (type ==nsXPTType::T_I32) ++ dp->val.i32 = (PRInt32) tempu64; ++ else if (type ==nsXPTType::T_I64) ++ dp->val.i64 = (PRInt64) tempu64; ++ else if (type ==nsXPTType::T_U8) ++ dp->val.u8 = (PRUint8) tempu64; ++ else if (type ==nsXPTType::T_U16) ++ dp->val.u16 = (PRUint16) tempu64; ++ else if (type ==nsXPTType::T_U32) ++ dp->val.u32 = (PRUint32) tempu64; ++ else if (type ==nsXPTType::T_U64) ++ dp->val.u64 = (PRUint64) tempu64; ++ else if (type ==nsXPTType::T_BOOL) ++ dp->val.b = (PRBool) tempu64; ++ else if (type ==nsXPTType::T_CHAR) ++ dp->val.c = (char) tempu64; ++ else if (type ==nsXPTType::T_WCHAR) ++ dp->val.wc = (wchar_t) tempu64; ++ else ++ NS_ASSERTION(0, "bad type"); ++ } ++ ++ if (i >= 7) ++ ap++; ++ } ++ ++ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); ++ ++ NS_RELEASE(iface_info); ++ ++ if (dispatchParams != paramBuffer) ++ delete [] dispatchParams; ++ ++ return result; ++} ++ ++// Load r11 with the constant 'n' and branch to SharedStub(). ++// ++// XXX Yes, it's ugly that we're relying on gcc's name-mangling here; ++// however, it's quick, dirty, and'll break when the ABI changes on ++// us, which is what we want ;-). ++ ++#if __GXX_ABI_VERSION < 100 ++#error Prehistoric GCC not supported here ++#else ++// gcc-3 version ++// ++// As G++3 ABI contains the length of the functionname in the mangled ++// name, it is difficult to get a generic assembler mechanism like ++// in the G++ 2.95 case. ++// Create names would be like: ++// _ZN14nsXPTCStubBase5Stub1Ev ++// _ZN14nsXPTCStubBase6Stub12Ev ++// _ZN14nsXPTCStubBase7Stub123Ev ++// _ZN14nsXPTCStubBase8Stub1234Ev ++// etc. ++// Use assembler directives to get the names right... ++ ++# define STUB_ENTRY(n) \ ++__asm__ ( \ ++ ".section \".toc\",\"aw\" \n\t" \ ++ ".section \".text\" \n\t" \ ++ ".align 2 \n\t" \ ++ ".if "#n" < 10 \n\t" \ ++ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ ++ ".section \".opd\",\"aw\" \n\t" \ ++ ".align 3 \n\t" \ ++"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ ++ ".quad ._ZN14nsXPTCStubBase5Stub"#n"Ev,.TOC. at tocbase \n\t" \ ++ ".previous \n\t" \ ++ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev, at function \n\n" \ ++"._ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ ++ \ ++ ".elseif "#n" < 100 \n\t" \ ++ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ ++ ".section \".opd\",\"aw\" \n\t" \ ++ ".align 3 \n\t" \ ++"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ ++ ".quad ._ZN14nsXPTCStubBase6Stub"#n"Ev,.TOC. at tocbase \n\t" \ ++ ".previous \n\t" \ ++ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev, at function \n\n" \ ++"._ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ ++ \ ++ ".elseif "#n" < 1000 \n\t" \ ++ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ ++ ".section \".opd\",\"aw\" \n\t" \ ++ ".align 3 \n\t" \ ++"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ ++ ".quad ._ZN14nsXPTCStubBase7Stub"#n"Ev,.TOC. at tocbase \n\t" \ ++ ".previous \n\t" \ ++ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev, at function \n\n" \ ++"._ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ ++ \ ++ ".else \n\t" \ ++ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \ ++ ".endif \n\t" \ ++ \ ++ "li 11,"#n" \n\t" \ ++ "b SharedStub \n" \ ++); ++#endif ++ ++#define SENTINEL_ENTRY(n) \ ++nsresult nsXPTCStubBase::Sentinel##n() \ ++{ \ ++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ ++ return NS_ERROR_NOT_IMPLEMENTED; \ ++} ++ ++#include "xptcstubsdef.inc" Index: firefox.sh.in =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-6/firefox.sh.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- firefox.sh.in 31 Jan 2007 05:08:01 -0000 1.15 +++ firefox.sh.in 7 Mar 2007 09:35:16 -0000 1.16 @@ -36,10 +36,29 @@ ## ## Variables ## -MOZ_LIB_DIR="/usr/lib" -if [ -x "/usr/lib64/firefox-FIREFOX_VERSION/firefox-bin" ] -then - MOZ_LIB_DIR="/usr/lib64" +MOZ_ARCH=$(uname -m) +case $MOZ_ARCH in + x86_64 | ia64 | s390 ) + MOZ_LIB_DIR="/usr/lib64" + SECONDARY_LIB_DIR="/usr/lib" + ;; + * ) + MOZ_LIB_DIR="/usr/lib" + SECONDARY_LIB_DIR="/usr/lib64" + ;; +esac + +# [ -r /etc/sysconfig/firefox-arch ] && . /etc/sysconfig/firefox-arch + +if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then + if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then + echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin not found" + if [ -d $SECONDARY_LIB_DIR ]; then + echo " $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin not found" + fi + exit 1 + fi + MOZ_LIB_DIR="$SECONDARY_LIB_DIR" fi MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions" Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-6/firefox.spec,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- firefox.spec 1 Mar 2007 11:28:39 -0000 1.166 +++ firefox.spec 7 Mar 2007 09:35:16 -0000 1.167 @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.5.0.10 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -65,6 +65,7 @@ # Other Patch102: firefox-1.5-theme-change.patch +Patch103: firefox-1.5-ppc64.patch %if %{official_branding} # Required by Mozilla Corporation @@ -170,6 +171,7 @@ popd %patch102 -p0 -b .theme-change +%patch103 -p1 -b .ppc64 # For branding specific patches. @@ -452,6 +454,10 @@ #--------------------------------------------------------------------- %changelog +* Wed Mar 7 2007 David Woodhouse 1.5.0.10-4 +- Fix PPC64 runtime +- Fix firefox script to use 32-bit browser by default on PPC64 hardware + * Thu Mar 1 2007 Martin Stransky 1.5.0.10-3 - added fix for #227262 - Can't find jsautocfg64.h per firefox-js.pc From fedora-cvs-commits at redhat.com Wed Mar 7 10:19:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 05:19:32 -0500 Subject: rpms/beagle/devel beagle.spec,1.95,1.96 Message-ID: <200703071019.l27AJWI3004486@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3510 Modified Files: beagle.spec Log Message: * Wed Mar 7 2007 Alexander Larsson - 0.2.16.2-2 - Add manual requires for gsf-sharp and evolution-sharp (#230212) - Make beagle-evolution require beagle, not beagle-gui Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- beagle.spec 23 Feb 2007 05:42:57 -0000 1.95 +++ beagle.spec 7 Mar 2007 10:19:29 -0000 1.96 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.16.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops License: LGPL @@ -31,6 +31,10 @@ Requires: zip unzip sed grep poppler-utils Requires: libbeagle +# This should be picked up automatically by dep, but there is +# a problem with it. See bug #230212 +Requires: gsf-sharp + # 4.0.17-5 fixes bug #201991 Requires(pre): shadow-utils >= 4.0.17-5 @@ -66,7 +70,11 @@ %package evolution Summary: Beagle backend for evolution Group: User Interface/Desktops -Requires: beagle-gui = %{version}-%{release} +Requires: beagle = %{version}-%{release} + +# This should be picked up automatically by dep, but there is +# a problem with it. See bug #230212 +Requires: evolution-sharp %description evolution Beagle indexing backend for evolution @@ -325,6 +333,10 @@ %{_libdir}/python*/site-packages/beagle.so %changelog +* Wed Mar 7 2007 Alexander Larsson - 0.2.16.2-2 +- Add manual requires for gsf-sharp and evolution-sharp (#230212) +- Make beagle-evolution require beagle, not beagle-gui + * Thu Feb 22 2007 Matthias Clasen - 0.2.16.2-1 - Update to 0.2.16.2 From fedora-cvs-commits at redhat.com Wed Mar 7 10:33:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 05:33:24 -0500 Subject: rpms/kdbg/devel .cvsignore, 1.10, 1.11 kdbg.spec, 1.26, 1.27 sources, 1.10, 1.11 Message-ID: <200703071033.l27AXO99020250@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdbg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20172 Modified Files: .cvsignore kdbg.spec sources Log Message: 2.0.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdbg/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 16 Dec 2005 15:10:33 -0000 1.10 +++ .cvsignore 7 Mar 2007 10:33:22 -0000 1.11 @@ -2,3 +2,4 @@ kdbg-1.2.10.tar.gz kdbg-2.0.0.tar.gz kdbg-2.0.2.tar.gz +kdbg-2.0.5.tar.gz Index: kdbg.spec =================================================================== RCS file: /cvs/dist/rpms/kdbg/devel/kdbg.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- kdbg.spec 12 Jul 2006 06:37:48 -0000 1.26 +++ kdbg.spec 7 Mar 2007 10:33:22 -0000 1.27 @@ -1,17 +1,17 @@ Name: kdbg Summary: A GUI for gdb, the GNU debugger, and KDE. -Version: 2.0.2 -Release: 1.2.1 +Version: 2.0.5 +Release: 1%{?dist} Epoch: 1 Source: http://download.sourceforge.net/kdbg/%{name}-%{version}.tar.gz License: GPL -URL: http://members.telecom.at/~johsixt/kdbg.html +URL: http://www.kdbg.org/ Group: Development/Debuggers -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gdb -BuildRequires: kdelibs-devel >= 3.5.0 +BuildRequires: kdelibs-devel >= 6:3.5.6 %description KDbg is a K Desktop Environment (KDE) GUI for gdb, the GNU debugger. @@ -24,8 +24,6 @@ %build unset QTDIR || : ; source /etc/profile.d/qt.sh -export KDEDIR=%{_prefix} -export CXXFLAGS="$RPM_OPT_FLAGS" %configure --with-qt-dir=$QTDIR --disable-rpath @@ -60,6 +58,9 @@ %{_docdir}/HTML/en/%{name} %changelog +* Wed Mar 07 2007 Than Ngo - 1:2.0.5-1.fc7 +- 2.0.5 + * Wed Jul 12 2006 Jesse Keating - 1:2.0.2-1.2.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdbg/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Dec 2005 15:10:33 -0000 1.10 +++ sources 7 Mar 2007 10:33:22 -0000 1.11 @@ -1 +1 @@ -2035d31a9b257ce8338851ab0ce096c3 kdbg-2.0.2.tar.gz +1c0a90c82f27c0ddcdf0a4434d85119b kdbg-2.0.5.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 7 10:52:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 05:52:00 -0500 Subject: rpms/kdbg/devel kdbg.spec,1.27,1.28 Message-ID: <200703071052.l27Aq0dH011479@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdbg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11465 Modified Files: kdbg.spec Log Message: fix rpm filelist Index: kdbg.spec =================================================================== RCS file: /cvs/dist/rpms/kdbg/devel/kdbg.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- kdbg.spec 7 Mar 2007 10:33:22 -0000 1.27 +++ kdbg.spec 7 Mar 2007 10:51:58 -0000 1.28 @@ -12,6 +12,7 @@ Requires: gdb BuildRequires: kdelibs-devel >= 6:3.5.6 +BuildRequires: desktop-file-utils %description KDbg is a K Desktop Environment (KDE) GUI for gdb, the GNU debugger. @@ -56,6 +57,7 @@ %lang(de) %{_docdir}/HTML/de/%{name} %lang(ru) %{_docdir}/HTML/ru/%{name} %{_docdir}/HTML/en/%{name} +%config (noreplace) %{_datadir}/config/kdbgrc %changelog * Wed Mar 07 2007 Than Ngo - 1:2.0.5-1.fc7 From fedora-cvs-commits at redhat.com Wed Mar 7 11:02:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 06:02:58 -0500 Subject: rpms/file/devel file-4.20-REG_STARTEND.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 file-4.19-magic.patch, 1.1, 1.2 file.spec, 1.60, 1.61 sources, 1.17, 1.18 file-4.17-empty.patch, 1.1, NONE Message-ID: <200703071102.l27B2w3L011723@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/file/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11704 Modified Files: .cvsignore file-4.19-magic.patch file.spec sources Added Files: file-4.20-REG_STARTEND.patch Removed Files: file-4.17-empty.patch Log Message: * Wed Mar 7 2007 Martin Bacovsky - 4.20-1 - upgrade to new upstream 4.20 file-4.20-REG_STARTEND.patch: softmagic.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) --- NEW FILE file-4.20-REG_STARTEND.patch --- --- file-4.20/src/softmagic.c 18 Jan 2007 05:29:33 -0000 1.91 +++ file-4.20/src/softmagic.c 3 Mar 2007 19:09:25 -0000 1.95 @@ -38,7 +38,7 @@ #ifndef lint -FILE_RCSID("@(#)$File: softmagic.c,v 1.91 2007/01/18 05:29:33 ljt Exp $") +FILE_RCSID("@(#)$File: softmagic.c,v 1.95 2007/03/03 19:09:25 christos Exp $") #endif /* lint */ private int match(struct magic_set *, struct magic *, uint32_t, @@ -1523,10 +1523,20 @@ } else { regmatch_t pmatch[1]; +#ifndef REG_STARTEND +#define REG_STARTEND 0 + size_t l = ms->search.s_len - 1; + char c = ms->search.s[l]; + ((char *)(intptr_t)ms->search.s)[l] = '\0'; +#else pmatch[0].rm_so = 0; pmatch[0].rm_eo = ms->search.s_len; +#endif rc = regexec(&rx, (const char *)ms->search.s, 1, pmatch, REG_STARTEND); +#if REG_STARTEND == 0 + ((char *)(intptr_t)ms->search.s)[l] = c; +#endif switch (rc) { case 0: ms->search.s += (int)pmatch[0].rm_so; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 9 Jan 2007 19:23:01 -0000 1.17 +++ .cvsignore 7 Mar 2007 11:02:56 -0000 1.18 @@ -1 +1 @@ -file-4.19.tar.gz +file-4.20.tar.gz file-4.19-magic.patch: magic/Magdir/apple | 17 +++++++++++++++++ magic/Magdir/images | 6 ++++++ magic/Magdir/revision | 6 ++++++ magic/magic.mime | 24 ++++++++++++++---------- src/fsmagic.c | 3 ++- 5 files changed, 45 insertions(+), 11 deletions(-) Index: file-4.19-magic.patch =================================================================== RCS file: /cvs/dist/rpms/file/devel/file-4.19-magic.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- file-4.19-magic.patch 9 Jan 2007 19:23:02 -0000 1.1 +++ file-4.19-magic.patch 7 Mar 2007 11:02:56 -0000 1.2 @@ -53,15 +53,6 @@ 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 Index: file.spec =================================================================== RCS file: /cvs/dist/rpms/file/devel/file.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- file.spec 20 Feb 2007 13:46:00 -0000 1.60 +++ file.spec 7 Mar 2007 11:02:56 -0000 1.61 @@ -2,8 +2,8 @@ Summary: A utility for determining file types Name: file -Version: 4.19 -Release: 4%{?dist} +Version: 4.20 +Release: 1%{?dist} License: Distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -21,8 +21,7 @@ Patch20: file-4.17-bash.patch Patch21: file-4.19-ELF.patch Patch22: file-4.19-ooffice.patch - -#Patch19: file-4.17-empty.patch +Patch23: file-4.20-REG_STARTEND.patch Requires: file-libs = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,6 +69,7 @@ %patch20 -p1 -b .bash %patch21 -p1 -b .ELF %patch22 -p1 -b .ooffice +%patch23 -p1 -b .REG_STARTEND iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -127,17 +127,20 @@ %changelog -* Tue Feb 20 2007 Martin Bacovsky - 4.19-4.fc7 +* Wed Mar 7 2007 Martin Bacovsky - 4.20-1 +- upgrade to new upstream 4.20 + +* Tue Feb 20 2007 Martin Bacovsky - 4.19-4 - rpath in file removal -* Mon Feb 19 2007 Martin Bacovsky - 4.19-3.fc7 +* Mon Feb 19 2007 Martin Bacovsky - 4.19-3 - Resolves: #225750 - Merge Review: file -* Thu Jan 25 2007 Martin Bacovsky - 4.19-2.fc7 +* Thu Jan 25 2007 Martin Bacovsky - 4.19-2 - 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 +* Tue Jan 9 2007 Martin Bacovsky - 4.19-1 - 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 Index: sources =================================================================== RCS file: /cvs/dist/rpms/file/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 9 Jan 2007 19:23:02 -0000 1.17 +++ sources 7 Mar 2007 11:02:56 -0000 1.18 @@ -1 +1 @@ -a61ef3aa8339d5987148089afde25f60 file-4.19.tar.gz +402bdb26356791bd5d277099adacc006 file-4.20.tar.gz --- file-4.17-empty.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 7 11:11:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 06:11:49 -0500 Subject: rpms/gamin/devel gamin-conditional-poll.patch, NONE, 1.1 gamin.spec, 1.56, 1.57 Message-ID: <200703071111.l27BBnCN011896@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/gamin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11881 Modified Files: gamin.spec Added Files: gamin-conditional-poll.patch Log Message: * Wed Mar 7 2007 Alexander Larsson - 0.1.8-4 - Add patch to fix #204906 gamin-conditional-poll.patch: gam_poll_basic.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletion(-) --- NEW FILE gamin-conditional-poll.patch --- Index: server/gam_poll_basic.c =================================================================== --- server/gam_poll_basic.c (revision 320) +++ server/gam_poll_basic.c (working copy) @@ -46,6 +46,8 @@ static gboolean gam_poll_basic_remove_al static GaminEventType gam_poll_basic_poll_file(GamNode * node); static gboolean gam_poll_basic_scan_callback(gpointer data); +static gboolean scan_callback_running = FALSE; + gboolean gam_poll_basic_init () { @@ -56,7 +58,6 @@ gam_poll_basic_init () gam_poll_basic_remove_all_for, gam_poll_basic_poll_file); - g_timeout_add(1000, gam_poll_basic_scan_callback, NULL); GAM_DEBUG(DEBUG_INFO, "basic poll backend initialized\n"); return TRUE; } @@ -116,6 +117,12 @@ gam_poll_basic_add_subscription(GamSubsc gam_poll_generic_add (node); + if (!scan_callback_running) + { + scan_callback_running = TRUE; + g_timeout_add (1000, gam_poll_basic_scan_callback, NULL); + } + GAM_DEBUG(DEBUG_INFO, "Poll: added subscription for %s\n", path); return TRUE; } @@ -356,6 +363,7 @@ static gboolean gam_poll_basic_scan_callback(gpointer data) { int idx; + gboolean did_something = FALSE; gam_poll_generic_update_time (); @@ -371,6 +379,8 @@ gam_poll_basic_scan_callback(gpointer da g_assert (node); + did_something = TRUE; + if (node->is_dir) { gam_poll_generic_scan_directory_internal(node); } else { @@ -391,6 +401,8 @@ gam_poll_basic_scan_callback(gpointer da g_assert (node); + did_something = TRUE; + #ifdef VERBOSE_POLL GAM_DEBUG(DEBUG_INFO, "Checking missing file %s\n", node->path); #endif @@ -412,5 +424,10 @@ gam_poll_basic_scan_callback(gpointer da } } + if (!did_something) { + scan_callback_running = FALSE; + return FALSE; + } + return TRUE; } Index: gamin.spec =================================================================== RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- gamin.spec 7 Dec 2006 18:18:00 -0000 1.56 +++ gamin.spec 7 Mar 2007 11:11:47 -0000 1.57 @@ -1,7 +1,7 @@ Summary: Library providing the FAM File Alteration Monitor API Name: gamin Version: 0.1.8 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: Development/Libraries Source: gamin-%{version}.tar.gz @@ -25,6 +25,7 @@ Provides: fam-devel Patch1: gamin-0.1.7-fix-polling.patch +Patch2: gamin-conditional-poll.patch %description devel This C library provides an API and ABI compatible file alteration @@ -45,6 +46,7 @@ %setup -q %patch1 -p1 -b .fix-polling +%patch2 -p0 -b .conditional-poll %build autoreconf --force --install @@ -93,6 +95,9 @@ %doc doc/python.html %changelog +* Wed Mar 7 2007 Alexander Larsson - 0.1.8-4 +- Add patch to fix #204906 + * Thu Dec 7 2006 Jeremy Katz - 0.1.8-3 - rebuild for python 2.5 From fedora-cvs-commits at redhat.com Wed Mar 7 12:02:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 07:02:46 -0500 Subject: rpms/paps/devel paps-cups.patch,1.10,1.11 paps.spec,1.20,1.21 Message-ID: <200703071202.l27C2kEl001346@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/paps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1298 Modified Files: paps-cups.patch paps.spec Log Message: * Thu Mar 7 2007 Akira TAGOH - 0.6.6-18 - default to lpi=6 and cpi=10 if paps is bringing up as cups filter. (#223862) paps-cups.patch: configure.in | 13 ++++ src/Makefile.am | 4 - src/paps.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 170 insertions(+), 7 deletions(-) Index: paps-cups.patch =================================================================== RCS file: /cvs/dist/rpms/paps/devel/paps-cups.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- paps-cups.patch 23 Jan 2007 12:25:25 -0000 1.10 +++ paps-cups.patch 7 Mar 2007 12:02:43 -0000 1.11 @@ -1,6 +1,6 @@ -diff -pruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in +diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x 'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*' 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 2007-01-23 19:36:35.000000000 +0900 ++++ paps-0.6.6/configure.in 2007-02-15 23:34:24.000000000 +0900 @@ -7,4 +7,17 @@ AC_LANG_C AC_PROG_CC AM_PROG_LIBTOOL @@ -19,9 +19,9 @@ +AC_SUBST(CUPS_LIBS) + AC_OUTPUT(Makefile src/Makefile doc/Makefile) -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 +diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x 'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*' paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am +--- paps-0.6.6.orig/src/Makefile.am 2007-02-15 22:59:47.000000000 +0900 ++++ paps-0.6.6/src/Makefile.am 2007-02-15 23:34:24.000000000 +0900 @@ -5,10 +5,10 @@ libpaps_a_inc_HEADERS = libpaps.h libpaps_a_incdir = $(includedir) @@ -35,9 +35,9 @@ paps_DEPENDENCIES = $(noinst_LIBRARIES) EXTRA_DIST = test_libpaps.c paps.1 -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 +diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x 'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*' paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c +--- paps-0.6.6.orig/src/paps.c 2007-02-15 22:59:48.000000000 +0900 ++++ paps-0.6.6/src/paps.c 2007-03-07 20:58:31.000000000 +0900 @@ -32,6 +32,7 @@ #include #include @@ -78,7 +78,7 @@ /* Set locale from environment. */ setlocale(LC_ALL, ""); -@@ -333,6 +338,118 @@ int main(int argc, char *argv[]) +@@ -333,6 +338,128 @@ int main(int argc, char *argv[]) g_option_context_add_main_entries(ctxt, entries, NULL); @@ -96,6 +96,16 @@ + g_set_prgname(prgname); + /* argument format should be job-id user title copies options [file] */ + cups_mode = TRUE; ++ /* set default values */ ++ lpi = 6.0L; ++ cpi = 10.0L; ++ left_margin = 18; ++ right_margin = 18; ++ top_margin = 36; ++ bottom_margin = 36; ++ page_width = 612; ++ page_height = 792; ++ + if (argc < 6 || argc > 7) { + fprintf(stderr, "ERROR: %s job-id user title copies options [file]\n", prgname); + exit(1); @@ -197,7 +207,7 @@ /* Parse command line */ if (!g_option_context_parse(ctxt, &argc, &argv, &error)) { -@@ -359,6 +476,8 @@ int main(int argc, char *argv[]) +@@ -359,6 +486,8 @@ int main(int argc, char *argv[]) IN = stdin; } title = filename_in; @@ -206,7 +216,7 @@ paps = paps_new(); pango_context = paps_get_pango_context (paps); -@@ -377,8 +496,10 @@ int main(int argc, char *argv[]) +@@ -377,8 +506,10 @@ int main(int argc, char *argv[]) pango_context_set_font_description (pango_context, font_description); /* Page layout */ @@ -219,7 +229,7 @@ if (num_columns == 1) total_gutter_width = 0; -@@ -439,6 +560,8 @@ int main(int argc, char *argv[]) +@@ -439,6 +570,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; @@ -228,7 +238,7 @@ /* calculate x-coordinate scale */ if (cpi > 0.0L) -@@ -584,6 +707,12 @@ split_text_into_paragraphs (PangoContext +@@ -584,6 +717,12 @@ split_text_into_paragraphs (PangoContext if (wc == (gunichar)-1) { fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ()); @@ -241,7 +251,7 @@ wc = 0; } if (!*p || !wc || wc == '\n' || wc == '\f') -@@ -810,6 +939,7 @@ void print_postscript_header(FILE *OUT, +@@ -810,6 +949,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; @@ -249,7 +259,7 @@ /* Keep bounding box non-rotated to make ggv happy */ if (orientation) -@@ -819,12 +949,20 @@ void print_postscript_header(FILE *OUT, +@@ -819,12 +959,20 @@ void print_postscript_header(FILE *OUT, bb_page_height = tmp; } @@ -271,7 +281,7 @@ "%%%%BeginProlog\n" "%%%%Orientation: %s\n" "/papsdict 1 dict def\n" -@@ -874,8 +1012,10 @@ void print_postscript_header(FILE *OUT, +@@ -874,8 +1022,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.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- paps.spec 23 Jan 2007 12:25:25 -0000 1.20 +++ paps.spec 7 Mar 2007 12:02:43 -0000 1.21 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.6 -Release: 17%{?dist} +Release: 18%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -82,6 +82,9 @@ %changelog +* Thu Mar 7 2007 Akira TAGOH - 0.6.6-18 +- default to lpi=6 and cpi=10 if paps is bringing up as cups filter. (#223862) + * Tue Jan 23 2007 Akira TAGOH - Better the encoding guess by looking at current locale. (#212154) From fedora-cvs-commits at redhat.com Wed Mar 7 12:10:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 07:10:35 -0500 Subject: rpms/paps/FC-6 paps-0.6.6-langinfo.patch, NONE, 1.1 paps-cups.patch, 1.9, 1.10 paps.spec, 1.19, 1.20 Message-ID: <200703071210.l27CAZgx007168@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/paps/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7113 Modified Files: paps-cups.patch paps.spec Added Files: paps-0.6.6-langinfo.patch Log Message: * Thu Mar 7 2007 Akira TAGOH - 0.6.6-18 - default to lpi=6 and cpi=10 if paps is bringing up as cups filter. (#223862) 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 | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 170 insertions(+), 7 deletions(-) Index: paps-cups.patch =================================================================== RCS file: /cvs/dist/rpms/paps/FC-6/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 7 Mar 2007 12:10:32 -0000 1.10 @@ -1,7 +1,7 @@ -diff -ruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in +diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x 'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*' 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-02-15 23:34:24.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 -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x 'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*' paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am +--- paps-0.6.6.orig/src/Makefile.am 2007-02-15 22:59:47.000000000 +0900 ++++ paps-0.6.6/src/Makefile.am 2007-02-15 23:34:24.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 -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x 'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*' paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c +--- paps-0.6.6.orig/src/paps.c 2007-02-15 22:59:48.000000000 +0900 ++++ paps-0.6.6/src/paps.c 2007-03-07 20:58:31.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,128 @@ int main(int argc, char *argv[]) g_option_context_add_main_entries(ctxt, entries, NULL); @@ -95,6 +96,16 @@ + g_set_prgname(prgname); + /* argument format should be job-id user title copies options [file] */ + cups_mode = TRUE; ++ /* set default values */ ++ lpi = 6.0L; ++ cpi = 10.0L; ++ left_margin = 18; ++ right_margin = 18; ++ top_margin = 36; ++ bottom_margin = 36; ++ page_width = 612; ++ page_height = 792; ++ + if (argc < 6 || argc > 7) { + fprintf(stderr, "ERROR: %s job-id user title copies options [file]\n", prgname); + exit(1); @@ -133,11 +144,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 +190,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 +207,7 @@ /* Parse command line */ if (!g_option_context_parse(ctxt, &argc, &argv, &error)) { -@@ -355,6 +470,8 @@ +@@ -359,6 +486,8 @@ int main(int argc, char *argv[]) IN = stdin; } title = filename_in; @@ -203,7 +216,7 @@ paps = paps_new(); pango_context = paps_get_pango_context (paps); -@@ -373,8 +490,10 @@ +@@ -377,8 +506,10 @@ int main(int argc, char *argv[]) pango_context_set_font_description (pango_context, font_description); /* Page layout */ @@ -216,7 +229,7 @@ if (num_columns == 1) total_gutter_width = 0; -@@ -435,6 +554,8 @@ +@@ -439,6 +570,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 +238,7 @@ /* calculate x-coordinate scale */ if (cpi > 0.0L) -@@ -571,6 +692,12 @@ +@@ -584,6 +717,12 @@ split_text_into_paragraphs (PangoContext if (wc == (gunichar)-1) { fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ()); @@ -238,7 +251,7 @@ wc = 0; } if (!*p || !wc || wc == '\n' || wc == '\f') -@@ -784,6 +911,7 @@ +@@ -810,6 +949,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 +259,7 @@ /* Keep bounding box non-rotated to make ggv happy */ if (orientation) -@@ -793,12 +921,20 @@ +@@ -819,12 +959,20 @@ void print_postscript_header(FILE *OUT, bb_page_height = tmp; } @@ -268,7 +281,7 @@ "%%%%BeginProlog\n" "%%%%Orientation: %s\n" "/papsdict 1 dict def\n" -@@ -848,8 +984,10 @@ +@@ -874,8 +1022,10 @@ void print_postscript_header(FILE *OUT, title, bb_page_width, bb_page_height, Index: paps.spec =================================================================== RCS file: /cvs/dist/rpms/paps/FC-6/paps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- paps.spec 4 Dec 2006 11:48:54 -0000 1.19 +++ paps.spec 7 Mar 2007 12:10:32 -0000 1.20 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.6 -Release: 17%{?dist} +Release: 18%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -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,12 @@ %changelog +* Thu Mar 7 2007 Akira TAGOH - 0.6.6-18 +- default to lpi=6 and cpi=10 if paps is bringing up as cups filter. (#223862) + +* 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 Wed Mar 7 12:39:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 07:39:55 -0500 Subject: rpms/dejagnu/devel dejagnu-1.4.4-no-info.patch, NONE, 1.1 dejagnu.spec, 1.1, 1.2 Message-ID: <200703071239.l27Cdtjf014372@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/dejagnu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14356 Modified Files: dejagnu.spec Added Files: dejagnu-1.4.4-no-info.patch Log Message: - Remove mention of dejagnu.info from manpage, per comments in doc/Makefile. - Resolves: #230652 dejagnu-1.4.4-no-info.patch: runtest.1 | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) --- NEW FILE dejagnu-1.4.4-no-info.patch --- diff -urp dejagnu-1.4.4/doc/runtest.1 dejagnu-1.4.4-pm/doc/runtest.1 --- dejagnu-1.4.4/doc/runtest.1 2003-08-17 03:24:41.000000000 +0200 +++ dejagnu-1.4.4-pm/doc/runtest.1 2007-03-07 13:38:07.000000000 +0100 @@ -14,9 +14,7 @@ and variations on how to run them. You can find a comprehensive description of DejaGnu and \fBruntest\fR in .I -The DejaGnu Testing Framework -or its Info version, -.BR dejagnu.info . +The DejaGnu Testing Framework. .SH OPTIONS .TP .B --all @@ -110,8 +108,7 @@ file \fBsite.exp\fR, created during conf sets the exit code to 1 if any of the tests failed, or sets it to 0 if all the tests passed. .SH SEE ALSO -.I The DejaGnu Testing Framework -.RB ( dejagnu.info ). +.I The DejaGnu Testing Framework. This is the DejaGnu manual; its source is the SGML files .B doc/*.sgml. Index: dejagnu.spec =================================================================== RCS file: /cvs/dist/rpms/dejagnu/devel/dejagnu.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dejagnu.spec 7 Feb 2007 16:38:39 -0000 1.1 +++ dejagnu.spec 7 Mar 2007 12:39:53 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A front end for testing other programs Name: dejagnu Version: 1.4.4 -Release: 6 +Release: 7 Epoch: 1 License: GPL Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-1.4.4.tar.gz @@ -12,6 +12,7 @@ BuildArchitectures: noarch BuildRequires: jadetex docbook-utils-pdf tetex-dvips Patch1: dejagnu-1.4.4-smp-1.patch +Patch2: dejagnu-1.4.4-no-info.patch %description DejaGnu is an Expect/Tcl based framework for testing other programs. @@ -24,6 +25,7 @@ %prep %setup -q -n dejagnu-%{version} %patch1 -p1 +%patch2 -p1 %build %configure -v @@ -58,6 +60,11 @@ %changelog +* Wed Mar 7 2007 Petr Machata - 1:1.4.4-7 +- Remove mention of dejagnu.info from manpage, per comments in + doc/Makefile. +- Resolves: #230652 + * Wed Feb 7 2007 Petr Machata - 1:1.4.4-6 - Tidy up the specfile per rpmlint comments From fedora-cvs-commits at redhat.com Wed Mar 7 13:17:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 08:17:52 -0500 Subject: rpms/smartmontools/devel smartmontools.spec,1.29,1.30 Message-ID: <200703071317.l27DHqeF007974@cvs.devel.redhat.com> Author: vcrhonek Update of /cvs/dist/rpms/smartmontools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7960 Modified Files: smartmontools.spec Log Message: fix my previous mistakes Index: smartmontools.spec =================================================================== RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- smartmontools.spec 27 Feb 2007 08:57:04 -0000 1.29 +++ smartmontools.spec 7 Mar 2007 13:17:49 -0000 1.30 @@ -10,6 +10,7 @@ Source1: smartd.initd Source2: smartd-conf.py Source3: smartmontools.sysconf +Patch1: smartmontools-5.37-cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root PreReq: /sbin/chkconfig /sbin/service @@ -28,10 +29,11 @@ %prep %setup -q +%patch1 -p1 -b .cloexec %build %configure -make CFLAGS="$RPM_OPT_FLAGS -fpic" LDFLAGS="-pic -Wl,-z,relro,-z,now" +make CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-fpie -Wl,-z,relro,-z,now" %install rm -rf $RPM_BUILD_ROOT @@ -77,6 +79,10 @@ * Tue Feb 27 2007 Vitezslav Crhonek - 1:5.37-1 - new upstream version +* Thu Feb 22 2007 Tomas Mraz - 1:5.36-8 +- enable SMART on disks when smartd-conf.py runs (fix + by Calvin Ostrum) (#214502) + * Mon Feb 12 2007 Tomas Mraz - 1:5.36-7 - redirect service script output to null (#224566) From fedora-cvs-commits at redhat.com Wed Mar 7 13:29:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 08:29:37 -0500 Subject: rpms/net-snmp/devel net-snmp.spec,1.107,1.108 Message-ID: <200703071329.l27DTbfI001217@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1203 Modified Files: net-snmp.spec Log Message: add perl-devel Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- net-snmp.spec 1 Mar 2007 11:30:56 -0000 1.107 +++ net-snmp.spec 7 Mar 2007 13:29:35 -0000 1.108 @@ -45,7 +45,7 @@ Requires(preun): /bin/rm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bzip2-devel, beecrypt-devel, elfutils-devel -BuildRequires: libselinux-devel, elfutils-libelf-devel +BuildRequires: libselinux-devel, elfutils-libelf-devel, perl-devel %ifarch %{ix86} x86_64 BuildRequires: lm_sensors-devel %endif From fedora-cvs-commits at redhat.com Wed Mar 7 13:35:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 08:35:50 -0500 Subject: rpms/smartmontools/devel smartmontools.spec,1.30,1.31 Message-ID: <200703071335.l27DZoIu017978@cvs.devel.redhat.com> Author: vcrhonek Update of /cvs/dist/rpms/smartmontools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17946 Modified Files: smartmontools.spec Log Message: re-add cloexec patch, re-add one erased changelog entry, compile with -fpie (instead of -fpic) Index: smartmontools.spec =================================================================== RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- smartmontools.spec 7 Mar 2007 13:17:49 -0000 1.30 +++ smartmontools.spec 7 Mar 2007 13:35:48 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools Version: 5.37 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: System Environment/Base License: GPL @@ -76,6 +76,11 @@ %changelog +* Wed Mar 7 2007 Vitezslav Crhonek - 1:5.37-2 +- re-add cloexec patch +- re-add one erased changelog entry +- compile with -fpie (instead of -fpic) + * Tue Feb 27 2007 Vitezslav Crhonek - 1:5.37-1 - new upstream version From fedora-cvs-commits at redhat.com Wed Mar 7 13:39:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 08:39:58 -0500 Subject: rpms/smartmontools/devel smartmontools-5.37-cloexec.patch,NONE,1.1 Message-ID: <200703071339.l27DdwUU021075@cvs.devel.redhat.com> Author: vcrhonek Update of /cvs/dist/rpms/smartmontools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20742 Added Files: smartmontools-5.37-cloexec.patch Log Message: smartmontools-5.37-cloexec.patch smartmontools-5.37-cloexec.patch: os_linux.cpp | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) --- NEW FILE smartmontools-5.37-cloexec.patch --- --- smartmontools-5.37/os_linux.cpp.fix 2006-10-25 19:01:42.000000000 +0200 +++ smartmontools-5.37/os_linux.cpp 2007-02-27 13:20:55.000000000 +0100 @@ -190,14 +190,14 @@ // equivalent to open(path, flags) int deviceopen(const char *pathname, char *type){ + int fd = -1; if (!strcmp(type,"SCSI")) { - int fd = open(pathname, O_RDWR | O_NONBLOCK); + fd = open(pathname, O_RDWR | O_NONBLOCK); if (fd < 0 && errno == EROFS) fd = open(pathname, O_RDONLY | O_NONBLOCK); - return fd; } else if (!strcmp(type,"ATA")) - return open(pathname, O_RDONLY | O_NONBLOCK); + fd = open(pathname, O_RDONLY | O_NONBLOCK); else if (!strcmp(type,"ATA_3WARE_9000")) { // the device nodes for this controller are dynamically assigned, // so we need to check that they exist with the correct major @@ -207,7 +207,7 @@ errno=ENXIO; return -1; } - return open(pathname, O_RDONLY | O_NONBLOCK); + fd = open(pathname, O_RDONLY | O_NONBLOCK); } else if (!strcmp(type,"ATA_3WARE_678K")) { // the device nodes for this controller are dynamically assigned, @@ -218,15 +218,19 @@ errno=ENXIO; return -1; } - return open(pathname, O_RDONLY | O_NONBLOCK); + fd = open(pathname, O_RDONLY | O_NONBLOCK); } else if(!strcmp(type, "CCISS")) { // the device is a cciss smart array device. - return open(pathname, O_RDWR | O_NONBLOCK); + fd = open(pathname, O_RDWR | O_NONBLOCK); } else return -1; + if (fd != -1) { + fcntl(fd, F_SETFD, FD_CLOEXEC); + } + return fd; } // equivalent to close(file descriptor) From fedora-cvs-commits at redhat.com Wed Mar 7 13:48:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 08:48:00 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs-2.16.2-ipv6-link-local.patch, NONE, 1.1 gnome-vfs2.spec, 1.150, 1.151 Message-ID: <200703071348.l27Dm0Ee027313@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26928 Modified Files: gnome-vfs2.spec Added Files: gnome-vfs-2.16.2-ipv6-link-local.patch Log Message: * Wed Mar 7 2007 Alexander Larsson - 2.17.91-2 - Handle ipv6 link-local addresses better in network:/// (#212565) gnome-vfs-2.16.2-ipv6-link-local.patch: gnome-vfs-dns-sd.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) --- NEW FILE gnome-vfs-2.16.2-ipv6-link-local.patch --- --- gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-dns-sd.c.ipv6 2006-11-30 13:40:48.000000000 +0100 +++ gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-dns-sd.c 2006-11-30 14:28:48.000000000 +0100 @@ -1959,6 +1959,7 @@ struct sync_resolve_data { AvahiSimplePoll *poll; gboolean got_data; + gboolean got_link_local_ipv6; char *host; int port; char *text; @@ -1997,6 +1998,13 @@ data = user_data; if (event == AVAHI_RESOLVER_FOUND) { + if (address->proto == AVAHI_PROTO_INET6 && + address->data.ipv6.address[0] == 0xfe && + address->data.ipv6.address[1] == 0x80) { + data->got_link_local_ipv6 = TRUE; + goto out; + } + data->got_data = TRUE; avahi_address_snprint (a, sizeof(a), address); data->host = g_strdup (a); @@ -2005,7 +2013,7 @@ data->text = g_malloc (data->text_len); avahi_string_list_serialize (txt, data->text, data->text_len); } - + out: avahi_service_resolver_free (r); avahi_simple_poll_quit (data->poll); } @@ -2090,8 +2098,13 @@ AvahiClient *client = NULL; AvahiServiceResolver *sr; int error; + AvahiProtocol protocol; struct sync_resolve_data resolve_data = {0}; + protocol = AVAHI_PROTO_UNSPEC; + + retry: + simple_poll = avahi_simple_poll_new (); resolve_data.poll = simple_poll; if (simple_poll == NULL) { @@ -2109,7 +2122,8 @@ return GNOME_VFS_ERROR_GENERIC; } - sr = avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, + resolve_data.got_link_local_ipv6 = FALSE; + sr = avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, 0, avahi_resolve_sync_callback, &resolve_data); if (sr == NULL) { @@ -2127,6 +2141,14 @@ avahi_client_free (client); avahi_simple_poll_free (simple_poll); + + if (resolve_data.got_link_local_ipv6) { + /* We ignore non-routable ipv6 link-local addresses here, because our + api doesn't give the iface, so they are useless. Prefer ipv4 address instead */ + protocol = AVAHI_PROTO_INET; + goto retry; + } + if (resolve_data.got_data) { *host = resolve_data.host; *port = resolve_data.port; Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- gnome-vfs2.spec 13 Feb 2007 04:52:22 -0000 1.150 +++ gnome-vfs2.spec 7 Mar 2007 13:47:58 -0000 1.151 @@ -14,7 +14,7 @@ Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 Version: 2.17.91 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Source0: http://ftp.gnome.org/pub/gnome/source/gnome-vfs/2.17/gnome-vfs-%{version}.tar.bz2 @@ -69,6 +69,10 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=356772 Patch8: gnome-vfs-2.16.0-no-dbus.patch +# We broke network: on link-local ipv6 addresses (#212565) +Patch9: gnome-vfs-2.16.2-ipv6-link-local.patch + + %description GNOME VFS is the GNOME virtual file system. It is the foundation of the Nautilus file manager. It provides a modular architecture and @@ -121,6 +125,8 @@ %patch8 -p1 -b .no-dbus +%patch9 -p1 -b .ipv6 + %build if pkg-config openssl ; then @@ -223,6 +229,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Wed Mar 7 2007 Alexander Larsson - 2.17.91-2 +- Handle ipv6 link-local addresses better in network:/// (#212565) + * Mon Feb 12 2007 Matthias Clasen - 2.17.91-1 - Update to 2.17.91 From fedora-cvs-commits at redhat.com Wed Mar 7 15:11:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 10:11:00 -0500 Subject: rpms/kdeaddons/devel kdeaddons.spec,1.58,1.59 Message-ID: <200703071511.l27FB0lJ005130@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeaddons/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5112 Modified Files: kdeaddons.spec Log Message: - %%doc COPYING-DOCS - Requires(post,postun): xdg-utils Index: kdeaddons.spec =================================================================== RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- kdeaddons.spec 27 Feb 2007 14:42:02 -0000 1.58 +++ kdeaddons.spec 7 Mar 2007 15:10:58 -0000 1.59 @@ -1,5 +1,5 @@ Version: 3.5.6 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdeaddons Summary: K Desktop Environment - Plugins Group: User Interface/Desktops @@ -26,8 +26,8 @@ Requires: kdelibs >= 6:%{version} Requires: kdebase >= 6:%{version} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig +Requires(post): /sbin/ldconfig xdg-utils +Requires(postun): /sbin/ldconfig xdg-utils # Contains akregator konq-plugin Conflicts: akregator < 0:1.0 @@ -126,7 +126,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc README +%doc README COPYING-DOCS %doc rpmdocs/* %{_bindir}/* %{_libdir}/kde3/* @@ -187,6 +187,10 @@ %{_libdir}/kde3/mediacontrol_panelapplet* %changelog +* Wed Mar 07 2007 Than Ngo - 3.5.6-3.fc7 +- %%doc COPYING-DOCS +- Requires(post,postun): xdg-utils + * Tue Feb 27 2007 Than Ngo - 3.5.6-2.fc7 - cleanup specfile - kde* package splitting in -extras From fedora-cvs-commits at redhat.com Wed Mar 7 15:42:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 10:42:22 -0500 Subject: rpms/nfs-utils/devel nfs-utils.spec,1.120,1.121 Message-ID: <200703071542.l27FgMEc019632@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19538 Modified Files: nfs-utils.spec Log Message: Fixed typo in Summary Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- nfs-utils.spec 6 Mar 2007 20:17:30 -0000 1.120 +++ nfs-utils.spec 7 Mar 2007 15:42:20 -0000 1.121 @@ -1,4 +1,4 @@ -Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server. +Summary: NFS utilities and supporting clients and daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.12 Release: 1%{?dist} @@ -287,6 +287,7 @@ %changelog * Tue Mar 6 2007 Steve Dickson 1.0.12-1 - Upgraded to 1.0.12 +- Fixed typo in Summary. * Thu Mar 1 2007 Karel Zak 1.0.11-2 - Fixed mount.nfs -f (fake) option (bz 227988) From fedora-cvs-commits at redhat.com Wed Mar 7 16:06:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 11:06:18 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1092,1.1093 Message-ID: <200703071606.l27G6IKe029359@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29327 Modified Files: openoffice.org.spec Log Message: testbuild Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1092 retrieving revision 1.1093 diff -u -r1.1092 -r1.1093 --- openoffice.org.spec 7 Mar 2007 09:05:22 -0000 1.1092 +++ openoffice.org.spec 7 Mar 2007 16:06:16 -0000 1.1093 @@ -1,11 +1,11 @@ %define oootag OOF680 %define ooomilestone 10 -%define rh_rpm_release 2 +%define rh_rpm_release 1.0 # gcc#19664# %define stlvisibilityfcked 1 # undef to get english only and no-langpacks for a quick smoketest build -%define langpacks 1 +%define langpacks 0 %define gtkprintui 1 @@ -1039,7 +1039,7 @@ %patch64 -p1 -b .ooo74401.basctl.boost.patch %patch65 -p1 -b .workspace.configrefactor01.patch %patch66 -p1 -b .workspace.sixtyfour11.patch -%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch +#%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch %patch68 -p1 -b .ooo68717.gstreamer.video.patch %patch69 -p1 -b .ooo63159.sal.dtype.patch %patch70 -p1 -b .ooo75167.framework.workspacerestore.patch @@ -1122,7 +1122,7 @@ cd instsetoo_native/util #get an unpackaged raw install export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}" -export CLASSPATH=/usr/share/java/xml-commons-apis.jar +export CLASSPATH=/usr/share/java/xerces-j2.jar:/usr/share/java/xalan-j2.jar:/usr/share/java/dom3-xerces-j2.jar if ! dmake openoffice_en-US; then echo - ---dump log start--- cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log From fedora-cvs-commits at redhat.com Wed Mar 7 16:06:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 11:06:33 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1093,1.1094 Message-ID: <200703071606.l27G6XHl029587@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29550 Modified Files: openoffice.org.spec Log Message: testbuild Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1093 retrieving revision 1.1094 diff -u -r1.1093 -r1.1094 --- openoffice.org.spec 7 Mar 2007 16:06:16 -0000 1.1093 +++ openoffice.org.spec 7 Mar 2007 16:06:31 -0000 1.1094 @@ -1,6 +1,6 @@ %define oootag OOF680 %define ooomilestone 10 -%define rh_rpm_release 1.0 +%define rh_rpm_release 1.0.0 # gcc#19664# %define stlvisibilityfcked 1 From fedora-cvs-commits at redhat.com Wed Mar 7 16:08:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 7 Mar 2007 11:08:02 -0500 Subject: rpms/vixie-cron/devel vixie-cron.spec,1.91,1.92 Message-ID: <200703071608.l27G82E1030724@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30503 Modified Files: vixie-cron.spec Log Message: Change in spec for review. Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- vixie-cron.spec 5 Mar 2007 10:34:34 -0000 1.91 +++ vixie-cron.spec 7 Mar 2007 16:08:00 -0000 1.92 @@ -10,7 +10,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times Name: vixie-cron Version: 4.1 -Release: 76%{?dist} +Release: 77%{?dist} Epoch: 4 License: BSD Group: System Environment/Base @@ -101,9 +101,11 @@ Buildrequires: audit-libs-devel >= 1.4.1 %endif -Requires(post): /sbin/chkconfig /etc/init.d /sbin/service -Requires(postun): /sbin/chkconfig /etc/init.d /sbin/service -Requires(preun): /sbin/chkconfig /etc/init.d /sbin/service +Requires(post): /sbin/chkconfig coreutils +Requires(postun): /sbin/chkconfig +Requires(postun): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %description The vixie-cron package contains the Vixie version of cron. Cron is a @@ -140,7 +142,7 @@ %patch18 -p1 -b .cron_log_facility %patch19 -p1 -b .crontab_stat_not_fstat %patch20 -p1 -b .nickname_man -%patch21 -p1 -b -i_option +%patch21 -p1 -b .-i_option %patch22 -p1 -b .no_0600_mode_enforce #%if %{WITH_SELINUX} %patch23 -p1 -b .freecon_segv @@ -189,6 +191,7 @@ %patch65 -p1 -b ._63newavc %build +# RPM_OPT_FLAGS are better here, because we don't have configure for set up variables ;-) make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint" \ %if %{WITH_SELINUX} WITH_SELINUX=1 \ @@ -203,19 +206,15 @@ %install rm -rf $RPM_BUILD_ROOT -#mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin} mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_sbindir} -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5,8} +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5,8} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d make install -p DESTDIR=$RPM_BUILD_ROOT DESTMAN=$RPM_BUILD_ROOT%{_mandir} -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron -chmod 700 $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d -chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d -install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond -chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/crond +mkdir -pm700 $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron +mkdir -pm755 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d +install -pm755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond %if ! %{WITH_PAM} @@ -230,9 +229,9 @@ [ ! -f /etc/cron.allow ] && [ ! -f /etc/cron.deny ] && touch /etc/cron.deny ||:; %preun -if [ "$1" = 0 ]; then - [ -f /var/lock/subsys/crond ] && /sbin/service crond stop >/dev/null 2>&1 - /sbin/chkconfig --del crond +if [ $1 = 0 ]; then + /sbin/service crond stop >/dev/null 2>&1 || : + /sbin/chkconfig --del