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